From 6b3ded8dfcef1008aff3ec8ab2c0eb4ddfbe8266 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Wed, 17 Apr 2019 11:38:34 +0200 Subject: [PATCH] hotfix tagging of webapp builds (#143) since the introduction of the php base image version information in the webapp container are doubled. by removing the build args from the php image at least there is no "newest" version any longer for webapp, but it still shows the version twice. this introduces a hotfix for this behaviour. Signed-off-by: Felix Bartels --- Makefile | 2 +- php/Dockerfile | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 9b02cc3..a6e7318 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,7 @@ tag-web: tag-webapp: $(eval webapp_version := \ - $(shell docker run --rm $(docker_repo)/kopano_webapp cat /kopano/buildversion | grep webapp | cut -d- -f2 | cut -d+ -f1)) + $(shell docker run --rm $(docker_repo)/kopano_webapp cat /kopano/buildversion | grep webapp | cut -d- -f2 | cut -d+ -f1 | head -n 1)) component=webapp make tag-container tag-zpush: diff --git a/php/Dockerfile b/php/Dockerfile index 5f5d6a9..47be769 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -5,32 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive ARG ADDITIONAL_KOPANO_PACKAGES="" ENV ADDITIONAL_KOPANO_PACKAGES=$ADDITIONAL_KOPANO_PACKAGES -ARG ADDITIONAL_KOPANO_WEBAPP_PLUGINS="" -ENV ADDITIONAL_KOPANO_WEBAPP_PLUGINS=$ADDITIONAL_KOPANO_WEBAPP_PLUGINS ARG DOWNLOAD_COMMUNITY_PACKAGES=1 ENV DOWNLOAD_COMMUNITY_PACKAGES=$DOWNLOAD_COMMUNITY_PACKAGES ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ENV KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" ENV KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS -ARG KOPANO_WEBAPP_REPOSITORY_URL="file:/kopano/repo/webapp" -ENV KOPANO_WEBAPP_REPOSITORY_URL=$KOPANO_WEBAPP_REPOSITORY_URL -ARG KOPANO_WEBAPP_SMIME_REPOSITORY_URL="file:/kopano/repo/smime" -ENV KOPANO_WEBAPP_SMIME_REPOSITORY_URL=$KOPANO_WEBAPP_SMIME_REPOSITORY_URL -ARG KOPANO_WEBAPP_MDM_REPOSITORY_URL="file:/kopano/repo/mdm" -ENV KOPANO_WEBAPP_MDM_REPOSITORY_URL=$KOPANO_WEBAPP_MDM_REPOSITORY_URL -ARG KOPANO_WEBAPP_FILES_REPOSITORY_URL="file:/kopano/repo/files" -ENV KOPANO_WEBAPP_FILES_REPOSITORY_URL=$KOPANO_WEBAPP_FILES_REPOSITORY_URL ARG KOPANO_CORE_VERSION=newest ENV KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION -ARG KOPANO_WEBAPP_VERSION=newest -ENV KOPANO_WEBAPP_VERSION=$KOPANO_WEBAPP_VERSION -ARG KOPANO_WEBAPP_FILES_VERSION=newest -ENV KOPANO_WEBAPP_FILES_VERSION=$KOPANO_WEBAPP_FILES_VERSION -ARG KOPANO_WEBAPP_MDM_VERSION=newest -ENV KOPANO_WEBAPP_MDM_VERSION=$KOPANO_WEBAPP_MDM_VERSION -ARG KOPANO_WEBAPP_SMIME_VERSION=newest -ENV KOPANO_WEBAPP_SMIME_VERSION=$KOPANO_WEBAPP_SMIME_VERSION ARG RELEASE_KEY_DOWNLOAD=0 ENV RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD @@ -76,4 +58,4 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ EXPOSE 9080/tcp COPY start-helper.sh /kopano/start-helper.sh -COPY kweb.cfg /etc/kweb.cfg \ No newline at end of file +COPY kweb.cfg /etc/kweb.cfg