From d66c1a3df9d65a008a33b32598126ee9b8520ab2 Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Fri, 2 Oct 2020 15:13:35 +0200 Subject: [PATCH] Prepare update of kopano-meet for Univention (#466) * add kapps repo to base image to prevent from potentially updated components (for example kweb) * kapps needs to be added to php image, not webapp image * ignore unknown syntax for build time secrets * update Konnect --- base/Dockerfile | 1 + core/Dockerfile | 3 +++ kapps/Dockerfile | 13 +++++-------- konnect/Dockerfile | 2 +- php/Dockerfile | 3 +++ web/Dockerfile | 2 +- webapp/Dockerfile | 8 ++++---- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 4020b88..439c294 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -83,6 +83,7 @@ ONBUILD RUN \ . /kopano/helper/create-kopano-repo.sh && \ if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \ dl_and_package_community "core" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \ + dl_and_package_community "kapps" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \ fi ARG VCS_REF diff --git a/core/Dockerfile b/core/Dockerfile index 75b57fb..c65acb6 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -8,6 +8,8 @@ ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest +ARG KOPANO_KAPPS_REPOSITORY_URL="file:/kopano/repo/kapps" +ARG KOPANO_KAPPS_VERSION=newest ENV \ ADDITIONAL_KOPANO_PACKAGES=$ADDITIONAL_KOPANO_PACKAGES \ @@ -43,6 +45,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # apt key for this repo has already been installed in base echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ + echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_KAPPS_REPOSITORY_URL} ./" >> /etc/apt/sources.list.d/kopano.list; \ # install apt-get update && \ set -x && \ diff --git a/kapps/Dockerfile b/kapps/Dockerfile index 586b05e..f23a7d9 100644 --- a/kapps/Dockerfile +++ b/kapps/Dockerfile @@ -1,3 +1,4 @@ +# syntax = docker/dockerfile:1.0-experimental ARG docker_repo=zokradonh FROM ${docker_repo}/kopano_base:latest @@ -9,13 +10,13 @@ ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest ARG KOPANO_KAPPS_REPOSITORY_URL="file:/kopano/repo/kapps" ARG KOPANO_KAPPS_VERSION=newest -ENV KOPANO_KAPPS_VERSION=$KOPANO_KAPPS_VERSION ENV \ ADDITIONAL_KOPANO_PACKAGES=$ADDITIONAL_KOPANO_PACKAGES \ DOWNLOAD_COMMUNITY_PACKAGES=$DOWNLOAD_COMMUNITY_PACKAGES \ KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \ KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \ + KOPANO_KAPPS_VERSION=$KOPANO_KAPPS_VERSION \ KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS LABEL maintainer=az@zok.xyz \ @@ -28,13 +29,9 @@ LABEL maintainer=az@zok.xyz \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# install Kopano Core and refresh ca-certificates -RUN \ - # community download and package as apt source repository - . /kopano/helper/create-kopano-repo.sh && \ - if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \ - dl_and_package_community "kapps"; \ - fi; \ +# hadolint ignore=SC2215 +RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ + # apt key for this repo has already been installed in base echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_KAPPS_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ # install apt-get update && \ diff --git a/konnect/Dockerfile b/konnect/Dockerfile index 77885f9..c0375ac 100644 --- a/konnect/Dockerfile +++ b/konnect/Dockerfile @@ -1,4 +1,4 @@ -ARG CODE_VERSION=0.33.6 +ARG CODE_VERSION=0.33.8 FROM golang:1.15-alpine3.12 as builder-sponge diff --git a/php/Dockerfile b/php/Dockerfile index b5f801f..200ab7a 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -8,6 +8,8 @@ ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" ARG DEBIAN_FRONTEND=noninteractive ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core" ARG KOPANO_CORE_VERSION=newest +ARG KOPANO_KAPPS_REPOSITORY_URL="file:/kopano/repo/kapps" +ARG KOPANO_KAPPS_VERSION=newest ENV \ ADDITIONAL_KOPANO_PACKAGES=$ADDITIONAL_KOPANO_PACKAGES \ @@ -31,6 +33,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # apt key for this repo has already been installed in base echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ + echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_KAPPS_REPOSITORY_URL} ./" >> /etc/apt/sources.list.d/kopano.list; \ # install set -x && \ apt-get update && apt-get install -y --no-install-recommends \ diff --git a/web/Dockerfile b/web/Dockerfile index 0dd0d55..2bec91d 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -ARG CODE_VERSION=0.12.3 +ARG CODE_VERSION=0.12.4 FROM kopano/kwebd:${CODE_VERSION} ARG CODE_VERSION diff --git a/webapp/Dockerfile b/webapp/Dockerfile index fda654e..b0d1564 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -4,15 +4,15 @@ FROM ${docker_repo}/kopano_php ARG ADDITIONAL_KOPANO_PACKAGES="" ARG ADDITIONAL_KOPANO_WEBAPP_PLUGINS="" -ARG DOWNLOAD_COMMUNITY_PACKAGES=1 -ARG KOPANO_REPOSITORY_FLAGS="trusted=yes" ARG DEBIAN_FRONTEND=noninteractive +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 KOPANO_WEBAPP_FILES_REPOSITORY_URL="file:/kopano/repo/files" +ARG KOPANO_WEBAPP_MDM_REPOSITORY_URL="file:/kopano/repo/mdm" ARG KOPANO_WEBAPP_REPOSITORY_URL="file:/kopano/repo/webapp" ARG KOPANO_WEBAPP_SMIME_REPOSITORY_URL="file:/kopano/repo/smime" -ARG KOPANO_WEBAPP_MDM_REPOSITORY_URL="file:/kopano/repo/mdm" -ARG KOPANO_WEBAPP_FILES_REPOSITORY_URL="file:/kopano/repo/files" ARG KOPANO_WEBAPP_VERSION=newest ENV \