Rework label handling (#387)

* be smarter about labels inspired by https://github.com/Peter-SAARLAND/zero
2025-06-05 23:16:12 +00:00 · 2020-04-28 22:16:12 +02:00 · 2020-04-28 22:16:12 +02:00 · 110ea43bf6
commit 110ea43bf6
parent a0c14b6ad4
16 changed files with 58 additions and 48 deletions
--- a/base/Dockerfile
+++ b/base/Dockerfile
@ -1,6 +1,5 @@
 FROM debian:buster

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
 ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core"
@ -21,7 +20,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano base container" \
    org.label-schema.description="Base image for containers running the Kopano groupware stack" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$BASE_VERSION \
    org.label-schema.schema-version="1.0"
@ -89,3 +87,6 @@ ONBUILD RUN \
    if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
        dl_and_package_community "core" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \
    fi
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/core/Dockerfile
+++ b/core/Dockerfile
@ -1,7 +1,6 @@
 ARG docker_repo=zokradonh
 FROM ${docker_repo}/kopano_base

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
@ -31,7 +30,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano Groupware Core container" \
    org.label-schema.description="Container for running applications out of Kopano Groupware Core" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$KOPANO_CORE_VERSION \
    org.label-schema.schema-version="1.0"
@ -84,3 +82,6 @@ CMD [ "/kopano/start-service.sh" ]

 HEALTHCHECK --interval=1m --timeout=10s \
    CMD /kopano/healthcheck.sh
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/kdav/Dockerfile
+++ b/kdav/Dockerfile
@ -7,7 +7,6 @@ RUN composer install

 FROM ${docker_repo}/kopano_base

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
@ -28,7 +27,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano kDAV container" \
    org.label-schema.description="Container for running Kopano kDAV" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.schema-version="1.0"

@ -87,3 +85,6 @@ ENV LANG en_US.UTF-8

 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD [ "/kopano/start.sh" ]
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/konnect/Dockerfile
+++ b/konnect/Dockerfile
@ -8,7 +8,6 @@ RUN go install -v github.com/go-moreutils/sponge

 FROM kopano/konnectd:${CODE_VERSION}

-ARG VCS_REF
 ARG CODE_VERSION

 ENV CODE_VERSION="${CODE_VERSION}" \
@ -26,7 +25,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano Konnect container" \
    org.label-schema.description="Container for running Kopano Konnect" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$CODE_VERSION \
    org.label-schema.schema-version="1.0"
@ -51,3 +49,6 @@ COPY wrapper.sh /usr/local/bin
 USER nobody

 ENTRYPOINT ["wrapper.sh"]
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/kwmserver/Dockerfile
+++ b/kwmserver/Dockerfile
@ -1,27 +1,25 @@
 ARG CODE_VERSION=1.1.1
 FROM kopano/kwmserverd:${CODE_VERSION}

-ARG VCS_REF
 ARG CODE_VERSION
-
 ENV CODE_VERSION="${CODE_VERSION}"

 LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano Kwmserver container" \
    org.label-schema.description="Container for running Kopano Kwmserver (WebRTC signalling server)" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$CODE_VERSION \
    org.label-schema.schema-version="1.0"

-USER root
-
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]

+USER root
 ENV DOCKERIZE_VERSION v0.11.0
 RUN wget -O - https://github.com/powerman/dockerize/releases/download/"$DOCKERIZE_VERSION"/dockerize-"$(uname -s)"-"$(uname -m)" | install /dev/stdin /bin/dockerize
+USER nobody

 COPY wrapper.sh /usr/local/bin

-USER nobody
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/ldap/Dockerfile
+++ b/ldap/Dockerfile
@ -1,16 +1,13 @@
 ARG CODE_VERSION=1.3.0
 FROM osixia/openldap:${CODE_VERSION}

-ARG VCS_REF
 ARG CODE_VERSION
-
 ENV CODE_VERSION="${CODE_VERSION}"

 LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano LDAP container" \
    org.label-schema.description="Container for running OpenLDAP, which already has the Kopano schema included." \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$CODE_VERSION \
    org.label-schema.schema-version="1.0"
@ -18,3 +15,6 @@ LABEL maintainer=az@zok.xyz \
 COPY bootstrap /container/service/slapd/assets/config/bootstrap
 RUN rm /container/service/slapd/assets/config/bootstrap/schema/mmc/mail.schema
 RUN touch /etc/ldap/slapd.conf
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/meet/Dockerfile
+++ b/meet/Dockerfile
@ -1,7 +1,6 @@
 ARG docker_repo=zokradonh
 FROM ${docker_repo}/kopano_base:latest

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
@ -25,7 +24,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano Meet container" \
    org.label-schema.description="Container for running Kopano Meet" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$KOPANO_MEET_VERSION \
    org.label-schema.schema-version="1.0"
@ -61,3 +59,5 @@ CMD [ "/kopano/start-service.sh" ]
 HEALTHCHECK --interval=1m --timeout=10s \
    CMD goss -g /goss/goss.yaml validate

+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/php/Dockerfile
+++ b/php/Dockerfile
@ -1,7 +1,6 @@
 ARG docker_repo=zokradonh
 FROM ${docker_repo}/kopano_base

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
@ -22,7 +21,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano php container" \
    org.label-schema.description="Base container for running php based applications based on Kopano Groupware Core" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$KOPANO_CORE_VERSION \
    org.label-schema.schema-version="1.0"
@ -55,3 +53,6 @@ EXPOSE 9080/tcp

 COPY start-helper.sh /kopano/start-helper.sh
 COPY kweb.cfg /etc/kweb.cfg
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/playground/Dockerfile
+++ b/playground/Dockerfile
@ -1,4 +1,4 @@
-from alpine:3.11 as builder
+FROM alpine:3.11 as builder

 RUN apk add --no-cache \
        git make
@ -12,7 +12,6 @@ RUN rm Makefile && ln -s oidc-client-example.html index.html

 FROM halverneus/static-file-server:v1.7.0

-ARG VCS_REF
 ARG CODE_VERSION

 ENV PORT 8888
@ -21,8 +20,10 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano Playground" \
    org.label-schema.description="Container for running Kopano playground applications for Kapi and OIDC" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.schema-version="1.0"

 COPY --from=builder /web /web
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/python/Dockerfile
+++ b/python/Dockerfile
@ -1,7 +1,6 @@
 ARG docker_repo=zokradonh
 FROM ${docker_repo}/kopano_base

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
@ -22,7 +21,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano Python container" \
    org.label-schema.description="Container for running python based applications for Kopano Groupware Core" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$KOPANO_CORE_VERSION \
    org.label-schema.schema-version="1.0"
@ -37,4 +35,7 @@ RUN \
    apt-get update && apt-get install -y --no-install-recommends \
        python3-kopano \
        ${ADDITIONAL_KOPANO_PACKAGES} \
-    && rm -rf /var/cache/apt /var/lib/apt/lists
+    && rm -rf /var/cache/apt /var/lib/apt/lists
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/scheduler/Dockerfile
+++ b/scheduler/Dockerfile
@ -1,7 +1,5 @@
 FROM docker:18.09

-ARG VCS_REF
-
 ENV \
    DOCKERIZE_VERSION=v0.6.1 \
    GOSS_VERSION=v0.3.7 \
@ -11,7 +9,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano scheduler container" \
    org.label-schema.description="Helper container for running tasks within the Kopano stack" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$SUPERCRONIC_VERSION \
    org.label-schema.schema-version="1.0"
@ -42,4 +39,7 @@ CMD ["start.sh"]

 # TODO interval does not only define how often the healtcheck is run, but also how long to wait for the first check after startup
 HEALTHCHECK --interval=60m --timeout=15s \
-    CMD goss -g /goss/goss.yaml validate
+    CMD goss -g /goss/goss.yaml validate
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/ssl/Dockerfile
+++ b/ssl/Dockerfile
@ -1,7 +1,5 @@
 FROM alpine:3.11

-ARG VCS_REF
-
 ENV CODE_VERSION=1.2.0 \
    PKI_ROOT=/kopano/easypki \
    PKI_ORGANIZATION="Internal Kopano System" \
@ -11,7 +9,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano SSL container" \
    org.label-schema.description="Helper Container for carrying out ssl related activities for the Kopano stack." \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$CODE_VERSION \
    org.label-schema.schema-version="1.0"
@ -28,3 +25,6 @@ COPY start.sh /start.sh
 RUN chmod a+x /start.sh

 CMD ["/start.sh"]
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/utils/Dockerfile
+++ b/utils/Dockerfile
@ -5,7 +5,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano utils container" \
    org.label-schema.description="Container that bundles various cli tools from Kopano Groupware Core" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$KOPANO_CORE_VERSION \
    org.label-schema.schema-version="1.0"
@ -27,3 +26,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
    && rm -rf /var/lib/apt/lists/*

 CMD [ "/bin/bash" ]
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/web/Dockerfile
+++ b/web/Dockerfile
@ -1,7 +1,14 @@
 ARG CODE_VERSION=0.9.1
 FROM kopano/kwebd:${CODE_VERSION}

-ARG VCS_REF
+LABEL maintainer=az@zok.xyz \
+    org.label-schema.name="Kopano Web container" \
+    org.label-schema.description="Reverse proxy for http(s) based components of kopano-docker" \
+    org.label-schema.url="https://kopano.io" \
+    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
+    org.label-schema.version=$CODE_VERSION \
+    org.label-schema.schema-version="1.0"
+
 ARG CODE_VERSION

 ENV \
@ -33,11 +40,5 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
 COPY wrapper.sh /usr/local/bin
 COPY kweb.cfg /etc/kweb.cfg

-LABEL maintainer=az@zok.xyz \
-    org.label-schema.name="Kopano Web container" \
-    org.label-schema.description="Reverse proxy for http(s) based components of kopano-docker" \
-    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
-    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
-    org.label-schema.version=$CODE_VERSION \
-    org.label-schema.schema-version="1.0"
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@ -1,7 +1,6 @@
 ARG docker_repo=zokradonh
 FROM ${docker_repo}/kopano_php

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG ADDITIONAL_KOPANO_WEBAPP_PLUGINS=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
@ -34,7 +33,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano WebApp container" \
    org.label-schema.description="Container for running Kopano WebApp" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$KOPANO_WEBAPP_VERSION \
    org.label-schema.schema-version="1.0"
@ -84,3 +82,6 @@ CMD [ "/kopano/start.sh" ]

 HEALTHCHECK --interval=1m --timeout=10s \
    CMD goss -g /goss/goss.yaml validate
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF
--- a/zpush/Dockerfile
+++ b/zpush/Dockerfile
@ -1,7 +1,6 @@
 ARG docker_repo=zokradonh
 FROM ${docker_repo}/kopano_base

-ARG VCS_REF
 ARG ADDITIONAL_KOPANO_PACKAGES=""
 ARG DOWNLOAD_COMMUNITY_PACKAGES=1
 ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
@ -26,7 +25,6 @@ LABEL maintainer=az@zok.xyz \
    org.label-schema.name="Kopano Z-Push container" \
    org.label-schema.description="Container for running Z-Push with Kopano Groupware Core" \
    org.label-schema.url="https://kopano.io" \
-    org.label-schema.vcs-ref=$VCS_REF \
    org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
    org.label-schema.version=$KOPANO_ZPUSH_VERSION \
    org.label-schema.schema-version="1.0"
@ -102,3 +100,6 @@ ENV LANG en_US.UTF-8

 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD [ "/kopano/start.sh" ]
+
+ARG VCS_REF
+LABEL org.label-schema.vcs-ref=$VCS_REF