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

🤖: Update build recipes for Tumbleweed
SUSE · Oct 11, 2024 · 37433a8 · 37433a8
2 parents f406c18 + 7fbcbbd
commit 37433a8
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 23 deletions.
diff --git a/busybox-image/busybox-image.changes b/busybox-image/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:00:03 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- switch to the more standard - separator also for OsContainers
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: opensuse/bci/bci-busybox:%OS_VERSION_ID_SP% opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-busybox:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-busybox:%OS_VERSION_ID_SP% opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%-%RELEASE% opensuse/bci/bci-busybox:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="busybox-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -28,19 +28,19 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="opensuse/bci/bci-busybox"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
+          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.busybox">
             <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI BusyBox"/>
             <label name="org.opencontainers.image.description" value="BusyBox container 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.version" value="%OS_VERSION_ID_SP%-%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
-            <label name="org.opencontainers.image.ref.name" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%OS_VERSION_ID_SP%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>

diff --git a/gitea-runner-image/Dockerfile b/gitea-runner-image/Dockerfile
@@ -16,7 +16,7 @@
 #!UseOBSRepositories
 
 #!BuildTag: opensuse/bci/bci-gitea-runner:%OS_VERSION_ID_SP%
-#!BuildTag: opensuse/bci/bci-gitea-runner:%OS_VERSION_ID_SP%.%RELEASE%
+#!BuildTag: opensuse/bci/bci-gitea-runner:%OS_VERSION_ID_SP%-%RELEASE%
 #!BuildTag: opensuse/bci/bci-gitea-runner:latest
 
 FROM opensuse/tumbleweed:latest
@@ -31,13 +31,13 @@ RUN set -euo pipefail; \
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Gitea action runner"
 LABEL org.opencontainers.image.description="Gitea action runner container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%"
+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.opencontainers.image.ref.name="%OS_VERSION_ID_SP%.%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/bci-gitea-runner:%OS_VERSION_ID_SP%.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%OS_VERSION_ID_SP%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/bci-gitea-runner:%OS_VERSION_ID_SP%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/gitea-runner-image/gitea-runner-image.changes b/gitea-runner-image/gitea-runner-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:00:03 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- switch to the more standard - separator also for OsContainers
+
 -------------------------------------------------------------------
 Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -16,7 +16,7 @@
 #!UseOBSRepositories
 
 #!BuildTag: opensuse/bci/bci-init:%OS_VERSION_ID_SP%
-#!BuildTag: opensuse/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%
+#!BuildTag: opensuse/bci/bci-init:%OS_VERSION_ID_SP%-%RELEASE%
 #!BuildTag: opensuse/bci/bci-init:latest
 
 FROM opensuse/tumbleweed:latest
@@ -31,13 +31,13 @@ RUN set -euo pipefail; \
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Init"
 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.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.opencontainers.image.ref.name="%OS_VERSION_ID_SP%.%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%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 org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/init-image/init-image.changes b/init-image/init-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:00:03 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- switch to the more standard - separator also for OsContainers
+
 -------------------------------------------------------------------
 Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/micro-image/micro-image.changes b/micro-image/micro-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:00:03 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- switch to the more standard - separator also for OsContainers
+
 -------------------------------------------------------------------
 Sat Sep 28 08:15:08 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: opensuse/bci/bci-micro:%OS_VERSION_ID_SP% opensuse/bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-micro:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-micro:%OS_VERSION_ID_SP% opensuse/bci/bci-micro:%OS_VERSION_ID_SP%-%RELEASE% opensuse/bci/bci-micro:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="micro-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -28,19 +28,19 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="opensuse/bci/bci-micro"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
+          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.micro">
             <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI Micro"/>
             <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.version" value="%OS_VERSION_ID_SP%-%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
-            <label name="org.opencontainers.image.ref.name" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%OS_VERSION_ID_SP%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-micro:%OS_VERSION_ID_SP%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>

diff --git a/minimal-image/minimal-image.changes b/minimal-image/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:00:03 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- switch to the more standard - separator also for OsContainers
+
 -------------------------------------------------------------------
 Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/minimal-image/minimal-image.kiwi b/minimal-image/minimal-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: opensuse/bci/bci-minimal:%OS_VERSION_ID_SP% opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-minimal:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-minimal:%OS_VERSION_ID_SP% opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%-%RELEASE% opensuse/bci/bci-minimal:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="minimal-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -28,19 +28,19 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="opensuse/bci/bci-minimal"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
+          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.minimal">
             <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI Minimal"/>
             <label name="org.opencontainers.image.description" value="Minimal container 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.version" value="%OS_VERSION_ID_SP%-%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
-            <label name="org.opencontainers.image.ref.name" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%OS_VERSION_ID_SP%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>