From 4932efba460ee9069a21e3ecf1f2c155db50bb17 Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Sun, 12 Jul 2020 10:38:14 +0200 Subject: [PATCH] Remove RELEASE_KEY_DOWNLOAD from the project (#422) * Remove RELEASE_KEY_DOWNLOAD from the project KOPANO_REPOSITORY_FLAGS should not default to always trusting Fixes #406 --- Makefile | 3 --- README.md | 1 - base/Dockerfile | 5 ++--- core/Dockerfile | 2 -- kapps/Dockerfile | 4 +--- kdav/Dockerfile | 4 +--- meet/Dockerfile | 2 -- php/Dockerfile | 4 +--- python/Dockerfile | 4 +--- setup.sh | 1 - webapp/Dockerfile | 4 +--- zpush/Dockerfile | 4 +--- 12 files changed, 8 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index f5f4a4b..2f73d44 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ KOPANO_WEBAPP_MDM_REPOSITORY_URL := file:/kopano/repo/mdm KOPANO_WEBAPP_REPOSITORY_URL := file:/kopano/repo/webapp KOPANO_WEBAPP_SMIME_REPOSITORY_URL := file:/kopano/repo/smime KOPANO_ZPUSH_REPOSITORY_URL := http://repo.z-hub.io/z-push:/final/Debian_10/ -RELEASE_KEY_DOWNLOAD := 0 DOWNLOAD_COMMUNITY_PACKAGES := 1 KOPANO_UID := 999 KOPANO_GID := 999 @@ -74,7 +73,6 @@ endif --build-arg KOPANO_WEBAPP_REPOSITORY_URL=$(KOPANO_WEBAPP_REPOSITORY_URL) \ --build-arg KOPANO_WEBAPP_SMIME_REPOSITORY_URL=$(KOPANO_WEBAPP_SMIME_REPOSITORY_URL) \ --build-arg KOPANO_ZPUSH_REPOSITORY_URL=$(KOPANO_ZPUSH_REPOSITORY_URL) \ - --build-arg RELEASE_KEY_DOWNLOAD=$(RELEASE_KEY_DOWNLOAD) \ --build-arg DOWNLOAD_COMMUNITY_PACKAGES=$(DOWNLOAD_COMMUNITY_PACKAGES) \ --build-arg ADDITIONAL_KOPANO_PACKAGES=$(ADDITIONAL_KOPANO_PACKAGES) \ --build-arg ADDITIONAL_KOPANO_WEBAPP_PLUGINS=$(ADDITIONAL_KOPANO_WEBAPP_PLUGINS) \ @@ -114,7 +112,6 @@ endif --build-arg KOPANO_WEBAPP_MDM_REPOSITORY_URL=$(KOPANO_WEBAPP_MDM_REPOSITORY_URL) \ --build-arg KOPANO_WEBAPP_SMIME_REPOSITORY_URL=$(KOPANO_WEBAPP_SMIME_REPOSITORY_URL) \ --build-arg KOPANO_ZPUSH_REPOSITORY_URL=$(KOPANO_ZPUSH_REPOSITORY_URL) \ - --build-arg RELEASE_KEY_DOWNLOAD=$(RELEASE_KEY_DOWNLOAD) \ --build-arg DOWNLOAD_COMMUNITY_PACKAGES=$(DOWNLOAD_COMMUNITY_PACKAGES) \ --cache-from $(docker_repo)/kopano_$(component):builder \ -t $(docker_repo)/kopano_$(component):builder $(component)/ diff --git a/README.md b/README.md index cc308ad..32577c6 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,6 @@ COMPOSE_FILE=docker-compose.yml:docker-compose.ports.yml:docker-compose.db.yml:d #KOPANO_WEBAPP_MDM_REPOSITORY_URL=https://download.kopano.io/supported/mdm:/final/Debian_10/ #KOPANO_WEBAPP_SMIME_REPOSITORY_URL=https://download.kopano.io/supported/smime:/final/Debian_10/ #KOPANO_ZPUSH_REPOSITORY_URL=http://repo.z-hub.io/z-push:/final/Debian_10/ -#RELEASE_KEY_DOWNLOAD=1 #DOWNLOAD_COMMUNITY_PACKAGES=0 ``` diff --git a/base/Dockerfile b/base/Dockerfile index 027ef0d..7b026f7 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -4,15 +4,14 @@ ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest -ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 +ARG KOPANO_REPOSITORY_FLAGS="" # Both UID and GID should not be set to values above 999 ARG KOPANO_UID=999 ARG KOPANO_GID=999 ENV \ - BASE_VERSION=2.1.0 \ + BASE_VERSION=2.2.0 \ DEBIAN_FRONTEND=noninteractive \ DEBUG="" diff --git a/core/Dockerfile b/core/Dockerfile index 2a65321..2afed06 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -5,7 +5,6 @@ FROM ${docker_repo}/kopano_base ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -26,7 +25,6 @@ ENV \ KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \ KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \ LANG=en_US.UTF-8 \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD \ SERVICE_TO_START=server LABEL maintainer=az@zok.xyz \ diff --git a/kapps/Dockerfile b/kapps/Dockerfile index e2bb17e..3ad9874 100644 --- a/kapps/Dockerfile +++ b/kapps/Dockerfile @@ -4,7 +4,6 @@ FROM ${docker_repo}/kopano_base:latest ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -17,8 +16,7 @@ ENV \ DOWNLOAD_COMMUNITY_PACKAGES=$DOWNLOAD_COMMUNITY_PACKAGES \ KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \ KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \ - KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD + KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS LABEL maintainer=az@zok.xyz \ org.label-schema.name="Kopano apps container" \ diff --git a/kdav/Dockerfile b/kdav/Dockerfile index 088bf1d..993f90f 100644 --- a/kdav/Dockerfile +++ b/kdav/Dockerfile @@ -11,7 +11,6 @@ FROM ${docker_repo}/kopano_base ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -21,8 +20,7 @@ ENV \ DOWNLOAD_COMMUNITY_PACKAGES=$DOWNLOAD_COMMUNITY_PACKAGES \ KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \ KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \ - KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD + KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS LABEL maintainer=az@zok.xyz \ org.label-schema.name="Kopano kDAV container" \ diff --git a/meet/Dockerfile b/meet/Dockerfile index f90fe34..a8cc1d6 100644 --- a/meet/Dockerfile +++ b/meet/Dockerfile @@ -5,7 +5,6 @@ FROM ${docker_repo}/kopano_base:latest ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -19,7 +18,6 @@ ENV \ KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \ KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \ KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD \ SERVICE_TO_START=meet LABEL maintainer=az@zok.xyz \ diff --git a/php/Dockerfile b/php/Dockerfile index 0dee7cc..ac86c33 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -5,7 +5,6 @@ FROM ${docker_repo}/kopano_base ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -15,8 +14,7 @@ ENV \ DOWNLOAD_COMMUNITY_PACKAGES=$DOWNLOAD_COMMUNITY_PACKAGES \ KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \ KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \ - KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD + KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS LABEL maintainer=az@zok.xyz \ org.label-schema.name="Kopano php container" \ diff --git a/python/Dockerfile b/python/Dockerfile index ea1b3d6..fdb46d7 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -5,7 +5,6 @@ FROM ${docker_repo}/kopano_base ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -15,8 +14,7 @@ ENV \ DOWNLOAD_COMMUNITY_PACKAGES=$DOWNLOAD_COMMUNITY_PACKAGES \ KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \ KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \ - KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD + KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS LABEL maintainer=az@zok.xyz \ org.label-schema.name="Kopano Python container" \ diff --git a/setup.sh b/setup.sh index 372b6b3..ea43a5a 100755 --- a/setup.sh +++ b/setup.sh @@ -349,7 +349,6 @@ COMPOSE_FILE=docker-compose.yml:docker-compose.ports.yml:docker-compose.db.yml:d #KOPANO_WEBAPP_REPOSITORY_URL=https://download.kopano.io/supported/webapp:/final/Debian_10/ #KOPANO_WEBAPP_SMIME_REPOSITORY_URL=https://download.kopano.io/supported/smime:/final/Debian_10/ #KOPANO_ZPUSH_REPOSITORY_URL=http://repo.z-hub.io/z-push:/final/Debian_10/ -#RELEASE_KEY_DOWNLOAD=1 #DOWNLOAD_COMMUNITY_PACKAGES=0 # Remove this variable to not push versioned containers with the :latest tag diff --git a/webapp/Dockerfile b/webapp/Dockerfile index a9461fa..90cfe44 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -6,7 +6,6 @@ ARG ADDITIONAL_KOPANO_PACKAGES="" ARG ADDITIONAL_KOPANO_WEBAPP_PLUGINS="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -28,8 +27,7 @@ ENV \ KOPANO_WEBAPP_REPOSITORY_URL=$KOPANO_WEBAPP_REPOSITORY_URL \ KOPANO_WEBAPP_SMIME_REPOSITORY_URL=$KOPANO_WEBAPP_SMIME_REPOSITORY_URL \ KOPANO_WEBAPP_VERSION=$KOPANO_WEBAPP_VERSION \ - LANG=en_US.UTF-8 \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD + LANG=en_US.UTF-8 LABEL maintainer=az@zok.xyz \ org.label-schema.name="Kopano WebApp container" \ diff --git a/zpush/Dockerfile b/zpush/Dockerfile index ad30b49..c5324a8 100644 --- a/zpush/Dockerfile +++ b/zpush/Dockerfile @@ -5,7 +5,6 @@ FROM ${docker_repo}/kopano_base ARG ADDITIONAL_KOPANO_PACKAGES="" ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" -ARG RELEASE_KEY_DOWNLOAD=0 ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest @@ -20,8 +19,7 @@ ENV \ KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \ KOPANO_ZPUSH_REPOSITORY_URL=$KOPANO_ZPUSH_REPOSITORY_URL \ KOPANO_ZPUSH_VERSION=$KOPANO_ZPUSH_VERSION \ - LANG=en_US.UTF-8 \ - RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD + LANG=en_US.UTF-8 LABEL maintainer=az@zok.xyz \ org.label-schema.name="Kopano Z-Push container" \