From 3f0bb48b1787b605608ae8f58ec15254585dc157 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 11 Aug 2025 13:58:07 -0400 Subject: [PATCH 1/8] ad-server: remove MAINTAINER line Remove MAINTAINER line from centos/fedora Container files. Replace with a org.opencontainers.image.authors label. Ensure labels are standard across the centos/fedora image files. Signed-off-by: John Mulligan --- images/ad-server/Containerfile.centos | 5 +++-- images/ad-server/Containerfile.fedora | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/images/ad-server/Containerfile.centos b/images/ad-server/Containerfile.centos index 9c28c32..5d4078c 100644 --- a/images/ad-server/Containerfile.centos +++ b/images/ad-server/Containerfile.centos @@ -5,11 +5,12 @@ ARG SAMBACC_VERSION_SUFFIX="" ARG SAMBA_SPECIFICS=daemon_cli_debug_output ARG INSTALL_CUSTOM_REPO= -MAINTAINER John Mulligan - LABEL org.opencontainers.image.title="Samba ADDC container" LABEL org.opencontainers.image.description="Samba ADDC container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" +LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan " COPY install-packages.sh /usr/local/bin/install-packages.sh RUN /usr/local/bin/install-packages.sh \ diff --git a/images/ad-server/Containerfile.fedora b/images/ad-server/Containerfile.fedora index 926a1f3..ed7250d 100644 --- a/images/ad-server/Containerfile.fedora +++ b/images/ad-server/Containerfile.fedora @@ -5,11 +5,12 @@ ARG SAMBACC_VERSION_SUFFIX="" ARG SAMBA_SPECIFICS=daemon_cli_debug_output ARG INSTALL_CUSTOM_REPO= -MAINTAINER John Mulligan - LABEL org.opencontainers.image.title="Samba ADDC container" LABEL org.opencontainers.image.description="Samba ADDC container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" +LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan " COPY install-packages.sh /usr/local/bin/install-packages.sh RUN /usr/local/bin/install-packages.sh \ From 66838bf30c362734952d04e87b2d5e341ce55d4f Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 11 Aug 2025 13:59:35 -0400 Subject: [PATCH 2/8] client: remove MAINTAINER line Remove MAINTAINER line from centos/fedora Container files. Replace with a org.opencontainers.image.authors label. Ensure labels are standard across the centos/fedora image files. Signed-off-by: John Mulligan --- images/client/Containerfile.centos | 4 ++-- images/client/Containerfile.fedora | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/client/Containerfile.centos b/images/client/Containerfile.centos index a444c03..5a15c44 100644 --- a/images/client/Containerfile.centos +++ b/images/client/Containerfile.centos @@ -2,12 +2,12 @@ FROM quay.io/centos/centos:stream9 -MAINTAINER Michael Adam - LABEL org.opencontainers.image.title="Samba Client container" LABEL org.opencontainers.image.description="Samba Client container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, Michael Adam " # https://github.com/samba-in-kubernetes/samba-container/issues/96#issuecomment-1387467396 diff --git a/images/client/Containerfile.fedora b/images/client/Containerfile.fedora index a9eef67..08b85b2 100644 --- a/images/client/Containerfile.fedora +++ b/images/client/Containerfile.fedora @@ -2,12 +2,12 @@ FROM registry.fedoraproject.org/fedora:42 -MAINTAINER Michael Adam - LABEL org.opencontainers.image.title="Samba Client container" LABEL org.opencontainers.image.description="Samba Client container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, Michael Adam " # https://github.com/samba-in-kubernetes/samba-container/issues/96#issuecomment-1387467396 From c74325e83418d1b455d56517bf0eb2e783edf366 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 11 Aug 2025 14:00:29 -0400 Subject: [PATCH 3/8] server: remove MAINTAINER line Remove MAINTAINER line from centos/fedora Container files. Replace with a org.opencontainers.image.authors label. Ensure labels are standard across the centos/fedora image files. Signed-off-by: John Mulligan --- images/server/Containerfile.centos | 4 ++-- images/server/Containerfile.fedora | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/images/server/Containerfile.centos b/images/server/Containerfile.centos index b60ebf4..e9da125 100644 --- a/images/server/Containerfile.centos +++ b/images/server/Containerfile.centos @@ -7,12 +7,12 @@ ARG INSTALL_CUSTOM_REPOS= ARG PACKAGE_SELECTION= ARG CEPH_FROM_CUSTOM=0 -MAINTAINER John Mulligan - LABEL org.opencontainers.image.title="Samba container" LABEL org.opencontainers.image.description="Samba container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan " COPY smb.conf /etc/samba/smb.conf diff --git a/images/server/Containerfile.fedora b/images/server/Containerfile.fedora index 06665d7..511ee5e 100644 --- a/images/server/Containerfile.fedora +++ b/images/server/Containerfile.fedora @@ -6,12 +6,13 @@ ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command ARG INSTALL_CUSTOM_REPO= ARG PACKAGE_SELECTION= -MAINTAINER John Mulligan - LABEL org.opencontainers.image.title="Samba container" LABEL org.opencontainers.image.description="Samba container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, John Mulligan " + COPY smb.conf /etc/samba/smb.conf COPY install-packages.sh /usr/local/bin/install-packages.sh From f065d4c3eb1c8e6245f0a7f3f76b7d5619360a2c Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 11 Aug 2025 14:01:12 -0400 Subject: [PATCH 4/8] server: remove MAINTAINER line Remove MAINTAINER line from centos/fedora Container files. Replace with a org.opencontainers.image.authors label. Ensure labels are standard across the centos/fedora image files. Signed-off-by: John Mulligan --- images/toolbox/Containerfile.centos | 4 +++- images/toolbox/Containerfile.fedora | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/images/toolbox/Containerfile.centos b/images/toolbox/Containerfile.centos index 974292f..d4b58a0 100644 --- a/images/toolbox/Containerfile.centos +++ b/images/toolbox/Containerfile.centos @@ -4,12 +4,14 @@ # This needs to be converted to something public and/or configurable # later. FROM quay.io/samba.org/samba-client:centos-latest -MAINTAINER Shachar Sharon LABEL org.opencontainers.image.title="Samba Toolbox container" LABEL org.opencontainers.image.description="Samba Toolbox container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, Shachar Sharon " + RUN dnf install --enablerepo=crb -y \ samba-test \ diff --git a/images/toolbox/Containerfile.fedora b/images/toolbox/Containerfile.fedora index d3dba57..e187554 100644 --- a/images/toolbox/Containerfile.fedora +++ b/images/toolbox/Containerfile.fedora @@ -1,10 +1,11 @@ FROM quay.io/samba.org/samba-client:latest -MAINTAINER Shachar Sharon LABEL org.opencontainers.image.title="Samba Toolbox container" LABEL org.opencontainers.image.description="Samba Toolbox container" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="The samba-container team, Shachar Sharon " RUN dnf -y install samba-test \ From c91b201660484c8a853dbf9f925715600f6fb594 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Sep 2025 13:39:21 -0400 Subject: [PATCH 5/8] ad-server: remove maintainer line from opensuse container file Signed-off-by: John Mulligan --- images/ad-server/Containerfile.opensuse | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/ad-server/Containerfile.opensuse b/images/ad-server/Containerfile.opensuse index 978df08..9dc4650 100644 --- a/images/ad-server/Containerfile.opensuse +++ b/images/ad-server/Containerfile.opensuse @@ -8,14 +8,15 @@ FROM opensuse/tumbleweed ARG SAMBA_SPECIFICS=daemon_cli_debug_output -MAINTAINER David Mulder - # labelprefix=org.opensuse.samba-ad-server LABEL org.opencontainers.image.title="Samba ADDC container" LABEL org.opencontainers.image.description="Samba ADDC container" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" +LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="David Mulder " LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-ad-server:%%PKG_VERSION%%-%RELEASE%" # endlabelprefix From bd89e08fa54f433abba880e40e8100c4a5e8bdc3 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Sep 2025 14:06:45 -0400 Subject: [PATCH 6/8] server: remove maintainer line from opensuse container file Signed-off-by: John Mulligan --- images/server/Containerfile.opensuse | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/server/Containerfile.opensuse b/images/server/Containerfile.opensuse index 9e7d329..b9754a5 100644 --- a/images/server/Containerfile.opensuse +++ b/images/server/Containerfile.opensuse @@ -8,14 +8,15 @@ FROM opensuse/tumbleweed ARG SAMBA_SPECIFICS=daemon_cli_debug_output,ctdb_leader_admin_command -MAINTAINER David Mulder - # labelprefix=org.opensuse.samba-server LABEL org.opencontainers.image.title="Samba container" LABEL org.opencontainers.image.description="Samba container" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" +LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="David Mulder " LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-server:%%PKG_VERSION%%-%RELEASE%" # endlabelprefix From 117bab448bd210009f38bc1ffb0752a08c9a7890 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Sep 2025 14:07:05 -0400 Subject: [PATCH 7/8] client: remove maintainer line from opensuse container file Signed-off-by: John Mulligan --- images/client/Containerfile.opensuse | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/client/Containerfile.opensuse b/images/client/Containerfile.opensuse index b5186aa..b12376d 100644 --- a/images/client/Containerfile.opensuse +++ b/images/client/Containerfile.opensuse @@ -6,7 +6,6 @@ # OBS doesn't allow a fully qualified image registry name for the offline build FROM opensuse/tumbleweed -MAINTAINER David Mulder # labelprefix=org.opensuse.samba-client LABEL org.opencontainers.image.title="Samba Client container" @@ -14,6 +13,9 @@ LABEL org.opencontainers.image.description="Samba Client container" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" +LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="David Mulder " LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-client:%%PKG_VERSION%%-%RELEASE%" # endlabelprefix From 6acc13a92cabb91806438c89ef0a4889184d9a17 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Sep 2025 14:07:20 -0400 Subject: [PATCH 8/8] toolbox: remove maintainer line from opensuse container file Signed-off-by: John Mulligan --- images/toolbox/Containerfile.opensuse | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/toolbox/Containerfile.opensuse b/images/toolbox/Containerfile.opensuse index d44e203..5f1937f 100644 --- a/images/toolbox/Containerfile.opensuse +++ b/images/toolbox/Containerfile.opensuse @@ -6,7 +6,6 @@ # OBS doesn't allow a fully qualified image registry name for the offline build FROM opensuse/tumbleweed -MAINTAINER David Mulder # labelprefix=org.opensuse.samba-toolbox LABEL org.opencontainers.image.title="Samba Toolbox container" @@ -14,6 +13,9 @@ LABEL org.opencontainers.image.description="Samba Toolbox container" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%" LABEL org.opencontainers.image.vendor="Samba in Kubernetes" +LABEL org.opencontainers.image.url="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.source="https://github.com/samba-in-kubernetes/samba-container" +LABEL org.opencontainers.image.authors="David Mulder " LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-toolbox:%%PKG_VERSION%%-%RELEASE%" # endlabelprefix