From 745a337ba545b072f509dbb67f21f75c9e30aee5dfdb01a99a079c981e9e7368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 23 Nov 2022 09:32:25 +0000 Subject: [PATCH 1/6] [info=6a04d7ce3442fa5f69070f3c4fc3e045] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/init-image?expand=0&rev=7 --- Dockerfile | 13 ++++++------- _service | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 998b84d..fddcd6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,15 @@ # SPDX-License-Identifier: MIT -#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP% -#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE% -#!BuildTag: bci/bci-init:latest +#!BuildTag: opensuse/bci/bci-init:%OS_VERSION_ID_SP% +#!BuildTag: opensuse/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE% +#!BuildTag: opensuse/bci/bci-init:latest + FROM opensuse/tumbleweed:latest MAINTAINER openSUSE (https://www.opensuse.org/) # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=org.opensuse.bci.init -LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI %OS_VERSION% Init Container Image" +LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Init Container Image" LABEL org.opencontainers.image.description="Systemd environment for containers based on the SLE Base Container Image. This container is not supported when using container runtime other than podman." LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%" LABEL org.opencontainers.image.url="https://www.opensuse.org" @@ -22,8 +23,6 @@ LABEL com.suse.release-stage="released" LABEL usage="This container should only be used to build containers for daemons. Add your packages and enable services using systemctl." RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip; zypper -n clean; rm -rf /var/log/* - - - CMD ["/usr/lib/systemd/systemd"] +RUN systemctl disable getty@tty1.service HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["/usr/bin/systemctl", "is-active", "multi-user.target"] diff --git a/_service b/_service index 52b4539..bec8a47 100644 --- a/_service +++ b/_service @@ -1,5 +1,4 @@ - \ No newline at end of file From d309830046d1f5196891d19573f0d65acd8956605b7ab31c9239b3538f680473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 21 Feb 2023 08:48:41 +0000 Subject: [PATCH 2/6] [info=06e678ced84b42990b3259933ccea89e] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/init-image?expand=0&rev=12 --- Dockerfile | 6 +++++- init-image.changes | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fddcd6c..de149b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,5 +24,9 @@ LABEL usage="This container should only be used to build containers for daemons. RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip; zypper -n clean; rm -rf /var/log/* CMD ["/usr/lib/systemd/systemd"] + +RUN mkdir -p /etc/systemd/system.conf.d/ && \ + printf "[Manager]\nLogColor=no" > \ + /etc/systemd/system.conf.d/01-sle-bci-nocolor.conf RUN systemctl disable getty@tty1.service -HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["/usr/bin/systemctl", "is-active", "multi-user.target"] +HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["/usr/bin/systemctl", "is-active", "multi-user.target"] diff --git a/init-image.changes b/init-image.changes index 262f8cb..f066f3a 100644 --- a/init-image.changes +++ b/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 12 07:50:18 UTC 2023 - Dirk Mueller + +- Disable systemd colors + ------------------------------------------------------------------- Fri Jul 15 11:08:17 UTC 2022 - Dan Čermák From 4a5ab11085bedd23f5a3a745c8d26feded3be6fe4cc8789ea141a8bb129953a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 3 Mar 2023 07:51:07 +0000 Subject: [PATCH 3/6] [info=b1baeee813f9496d8fc113bedc2fad2a] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/init-image?expand=0&rev=17 --- Dockerfile | 1 + _service | 2 +- init-image.changes | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de149b7..ed3722a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" +LABEL org.opencontainers.image.source="%SOURCEURL%" LABEL org.opensuse.reference="registry.opensuse.org/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" diff --git a/_service b/_service index bec8a47..1652e46 100644 --- a/_service +++ b/_service @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/init-image.changes b/init-image.changes index f066f3a..90591a6 100644 --- a/init-image.changes +++ b/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 3 07:24:36 UTC 2023 - Dan Čermák + +- Add org.opencontainers.image.source label set to %SOURCEURL% + ------------------------------------------------------------------- Thu Jan 12 07:50:18 UTC 2023 - Dirk Mueller From fd444ad3fff40d50e54fff062896fc027df1d4bb50215ad9a8daa71bdb63b023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 4 May 2023 13:20:18 +0000 Subject: [PATCH 4/6] [info=4579b134e5187d9e4c8bd0eaa04f932b] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/init-image?expand=0&rev=24 --- Dockerfile | 2 +- init-image.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed3722a..6e543b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL org.opensuse.reference="registry.opensuse.org/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.release-stage="released" diff --git a/init-image.changes b/init-image.changes index 90591a6..25e6ea2 100644 --- a/init-image.changes +++ b/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 26 06:18:43 UTC 2023 - Dirk Müller + +- Correct org.opensuse.reference label + ------------------------------------------------------------------- Fri Mar 3 07:24:36 UTC 2023 - Dan Čermák From 9a75baf8c08379870038896ce55efc0586ebf3ab6b8700db43fa52f93d54b702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 20 Jun 2023 16:17:50 +0000 Subject: [PATCH 5/6] [info=02ed89ee7ff86b908bcb7ad5e2a10d58] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/init-image?expand=0&rev=26 --- Dockerfile | 3 ++- init-image.changes | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e543b1..54373bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,9 @@ LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" +LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime" +LABEL org.opensuse.release-stage="released" -LABEL com.suse.release-stage="released" # endlabelprefix LABEL usage="This container should only be used to build containers for daemons. Add your packages and enable services using systemctl." diff --git a/init-image.changes b/init-image.changes index 25e6ea2..861acdc 100644 --- a/init-image.changes +++ b/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 30 06:52:56 UTC 2023 - Dan Čermák + +- Add release stage and lifecycle url + ------------------------------------------------------------------- Wed Apr 26 06:18:43 UTC 2023 - Dirk Müller From daf279a3ffa086a1f6580c6b6cac28cb03fd3b4887ccc4840732e8e79add963e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 26 Jun 2023 10:29:59 +0000 Subject: [PATCH 6/6] [info=1391f0918aa40405f28cd3d7105e7ec2] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/init-image?expand=0&rev=30 --- Dockerfile | 4 ++-- init-image.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 54373bb..9e1a83e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,8 @@ MAINTAINER openSUSE (https://www.opensuse.org/) # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=org.opensuse.bci.init -LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Init Container Image" -LABEL org.opencontainers.image.description="Systemd environment for containers based on the SLE Base Container Image. This container is not supported when using container runtime other than podman." +LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI openSUSE Tumbleweed Init" +LABEL org.opencontainers.image.description="Systemd environment for containers based on the SLE Base Container Image. This container is only supported with podman." LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" diff --git a/init-image.changes b/init-image.changes index 861acdc..ee5f470 100644 --- a/init-image.changes +++ b/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 23 15:33:33 UTC 2023 - Dirk Mueller + +- label capitalization and related cleanups + ------------------------------------------------------------------- Tue May 30 06:52:56 UTC 2023 - Dan Čermák