use onbuild to specify building of core repository only in one place

remove ca-certificates and git from kdav image

git should not be needed since kdav has a builder stage
ca-certificates is already installed in an earlier stage

Signed-off-by: Felix Bartels <felix@host-consultants.de>

Makefile

@@ -144,8 +144,8 @@ build-playground:
 	component=playground make build-builder
 	component=playground make build-simple
 
-#build-python:
+build-python:
-#	component=python make build
+	component=python make build
 
 build-kdav:
 	docker pull composer:1.9

base/Dockerfile

@@ -77,3 +77,11 @@ COPY create-kopano-repo.sh /kopano/helper/
 COPY kcconf.py /kopano/
 
 SHELL [ "/bin/bash", "-c"]
+
+ONBUILD ARG DOWNLOAD_COMMUNITY_PACKAGES=1
+ONBUILD 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 "core" "Debian_10"; \
+    fi;

core/Dockerfile

@@ -39,11 +39,6 @@ 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 "core" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \
-    fi; \
     # apt key has already been installed in base
     echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
     # install

kdav/Dockerfile

@@ -32,17 +32,10 @@ LABEL maintainer=az@zok.xyz \
     org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
     org.label-schema.schema-version="1.0"
 
-# install Kopano kDAV and refresh ca-certificates
+# install Kopano kDAV
 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 "core"; \
-    fi; \
     echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
     set -x && \
-    #apt-get update && apt-get -s -o Debug::pkgProblemResolver=yes install php7-mapi && \
-    apt-get update && apt-get -s -o Debug::pkgProblemResolver=yes install libkcutil0 && \
     apt-get update && apt-get install -y --no-install-recommends \
         apache2 \
         libapache2-mod-php7.3 \
@@ -53,8 +46,6 @@ RUN \
         php-zip \
         sqlite \
         php-sqlite3 \
-        ca-certificates \
-        git \
         unzip \
         ${ADDITIONAL_KOPANO_PACKAGES} \
     && rm -rf /var/cache/apt /var/lib/apt/lists/*

php/Dockerfile

@@ -32,11 +32,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # add install common php dependencies
 # hadolint ignore=SC2129
 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 "core" "Debian_10"; \
-    fi; \
     echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
     # install
     set -x && \

python/Dockerfile

@@ -31,15 +31,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # hadolint ignore=SC2129
 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 "core"; \
-    fi; \
     echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
     # install
     set -x && \
-    #apt-get update && apt-get -s -o Debug::pkgProblemResolver=yes install libical2 \
     apt-get update && apt-get install -y --no-install-recommends \
         python3-kopano \
         ${ADDITIONAL_KOPANO_PACKAGES} \