Skip to content

Commit 62f043d

Browse files
authored
Merge pull request nextcloud#6423 from nextcloud/enh/6410/add-labels
add `org.label-schema.vendor="Nextcloud"` label to all containers
2 parents a53f081 + 5536121 commit 62f043d

File tree

19 files changed

+39
-18
lines changed

19 files changed

+39
-18
lines changed

Containers/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ FROM alpine:3.21.3
33

44
RUN set -ex; \
55
apk upgrade --no-cache -a
6+
7+
LABEL org.label-schema.vendor="Nextcloud"

Containers/apache/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,5 @@ ENTRYPOINT ["/start.sh"]
8787
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
8888

8989
HEALTHCHECK CMD /healthcheck.sh
90-
LABEL com.centurylinklabs.watchtower.enable="false"
90+
LABEL com.centurylinklabs.watchtower.enable="false" \
91+
org.label-schema.vendor="Nextcloud"

Containers/borgbackup/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ ENTRYPOINT ["/start.sh"]
2323
# hadolint ignore=DL3002
2424
USER root
2525

26-
LABEL com.centurylinklabs.watchtower.enable="false"
26+
LABEL com.centurylinklabs.watchtower.enable="false" \
27+
org.label-schema.vendor="Nextcloud"
2728
ENV BORG_RETENTION_POLICY="--keep-within=7d --keep-weekly=4 --keep-monthly=6"

Containers/clamav/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ USER 100
2121
VOLUME /var/lib/clamav
2222
ENTRYPOINT ["/start.sh"]
2323
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
24-
LABEL com.centurylinklabs.watchtower.enable="false"
24+
LABEL com.centurylinklabs.watchtower.enable="false" \
25+
org.label-schema.vendor="Nextcloud"
2526
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh

Containers/collabora/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ COPY --chmod=775 healthcheck.sh /healthcheck.sh
1919
USER 1001
2020

2121
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
22-
LABEL com.centurylinklabs.watchtower.enable="false"
22+
LABEL com.centurylinklabs.watchtower.enable="false" \
23+
org.label-schema.vendor="Nextcloud"

Containers/docker-socket-proxy/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ COPY --chmod=664 haproxy.cfg /haproxy.cfg
1818

1919
ENTRYPOINT ["/start.sh"]
2020
HEALTHCHECK CMD /healthcheck.sh
21-
LABEL com.centurylinklabs.watchtower.enable="false"
21+
LABEL com.centurylinklabs.watchtower.enable="false" \
22+
org.label-schema.vendor="Nextcloud"

Containers/domaincheck/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ USER www-data
1717
ENTRYPOINT ["/start.sh"]
1818

1919
HEALTHCHECK CMD nc -z 127.0.0.1 $APACHE_PORT || exit 1
20-
LABEL com.centurylinklabs.watchtower.enable="false"
20+
LABEL com.centurylinklabs.watchtower.enable="false" \
21+
org.label-schema.vendor="Nextcloud"

Containers/fulltextsearch/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ COPY --chmod=775 healthcheck.sh /healthcheck.sh
2121
USER 1000:0
2222

2323
HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD /healthcheck.sh
24-
LABEL com.centurylinklabs.watchtower.enable="false"
24+
LABEL com.centurylinklabs.watchtower.enable="false" \
25+
org.label-schema.vendor="Nextcloud"
2526
ENV ES_JAVA_OPTS="-Xms512M -Xmx512M"

Containers/imaginary/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:latest
22
FROM golang:1.24.3-alpine3.21 AS go
33

4-
ENV IMAGINARY_HASH=1d4e251cfcd58ea66f8361f8721d7b8cc85002a3
4+
ENV IMAGINARY_HASH=1d4e251cfcd58ea66f8361f8721d7b8cc85002a3
55

66
RUN set -ex; \
77
apk upgrade --no-cache -a; \
@@ -42,4 +42,5 @@ ENV MALLOC_ARENA_MAX=2
4242
ENTRYPOINT ["/start.sh"]
4343

4444
HEALTHCHECK CMD /healthcheck.sh
45-
LABEL com.centurylinklabs.watchtower.enable="false"
45+
LABEL com.centurylinklabs.watchtower.enable="false" \
46+
org.label-schema.vendor="Nextcloud"

Containers/mastercontainer/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ COPY --chmod=664 Caddyfile /Caddyfile
122122
COPY --chmod=664 supervisord.conf /supervisord.conf
123123
COPY mastercontainer.conf /etc/apache2/sites-available/mastercontainer.conf
124124

125+
LABEL org.label-schema.vendor="Nextcloud"
126+
125127
# hadolint ignore=DL3002
126128
USER root
127129

0 commit comments

Comments
 (0)