Merge pull request #555 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed
SUSE · Jul 24, 2023 · b658f83 · b658f83
2 parents ffccd25 + 8df930d
commit b658f83
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 5 deletions.
diff --git a/git-image/git-image.changes b/git-image/git-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 24 12:54:31 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Fix base image naming in description label
+
 -------------------------------------------------------------------
 Mon Jul 17 15:11:44 UTC 2023 - SUSE Update Bot <[email protected]>
 

diff --git a/git-image/git-image.kiwi b/git-image/git-image.kiwi
@@ -20,7 +20,7 @@
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.git">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed openSUSE Tumbleweed with Git"/>
-            <label name="org.opencontainers.image.description" value="A micro environment with Git for containers based on the SLE Base Container Image."/>
+            <label name="org.opencontainers.image.description" value="A micro environment with Git based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%%git_version%%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -10,7 +10,7 @@ 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 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.description="Systemd environment for containers based on the openSUSE Tumbleweed 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/init-image.changes b/init-image/init-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 24 12:54:31 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Fix base image naming in description label
+
 -------------------------------------------------------------------
 Fri Jun 23 15:33:33 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/micro-image/micro-image.changes b/micro-image/micro-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 24 12:54:31 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Fix base image naming in description label
+
 -------------------------------------------------------------------
 Wed Jul 12 12:52:48 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi
@@ -20,7 +20,7 @@
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.micro">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed Micro"/>
-            <label name="org.opencontainers.image.description" value="A micro environment for containers based on the SLE Base Container Image."/>
+            <label name="org.opencontainers.image.description" value="A micro environment for containers based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>

diff --git a/nginx-image/Dockerfile b/nginx-image/Dockerfile
@@ -10,7 +10,7 @@ MAINTAINER openSUSE (https://www.opensuse.org/)
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.nginx
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed NGINX"
-LABEL org.opencontainers.image.description="NGINX open source all-in-one load balancer, content cache and web server {based_on_container}."
+LABEL org.opencontainers.image.description="NGINX open source all-in-one load balancer, content cache and web server based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%nginx_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"

diff --git a/nginx-image/nginx-image.changes b/nginx-image/nginx-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 24 12:54:31 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Fix base image naming in description label
+
 -------------------------------------------------------------------
 Sun Jul 23 09:35:12 UTC 2023 - SUSE Update Bot <[email protected]>
 

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -14,7 +14,7 @@ MAINTAINER openSUSE (https://www.opensuse.org/)
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.pcp
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Performance Co-Pilot (pcp)"
-LABEL org.opencontainers.image.description="Performance Co-Pilot (pcp) container image based on the SLE Base Container Image. This container is only supported with podman."
+LABEL org.opencontainers.image.description="Performance Co-Pilot (pcp) container based on the openSUSE Tumbleweed Base Container Image. This container is only supported with podman."
 LABEL org.opencontainers.image.version="%%pcp_patch%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"

diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 24 12:54:31 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Fix base image naming in description label
+
 -------------------------------------------------------------------
 Fri Jun 23 15:33:33 UTC 2023 - Dirk Mueller <[email protected]>