Merge pull request #1847 from SUSE/for-deploy-5

🤖: Update build recipes for SP5
SUSE · Oct 11, 2024 · 3e57fb7 · 3e57fb7
2 parents 97562c4 + c215289
commit 3e57fb7
Show file tree

Hide file tree

Showing 22 changed files with 73 additions and 18 deletions.
diff --git a/busybox-image/busybox-image.changes b/busybox-image/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Sep 25 17:17:45 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: bci/bci-busybox:%OS_VERSION_ID_SP% bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-busybox:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="busybox-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker">
       <containerconfig
           name="bci/bci-busybox"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%">
+          tag="%OS_VERSION_ID_SP%.%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.busybox">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%
 #!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%
+#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%
 #!BuildName: bci-bci-init-%OS_VERSION_ID_SP%
 #!BuildVersion: 15.5
 FROM registry.suse.com/bci/bci-base:15.5

diff --git a/init-image/init-image.changes b/init-image/init-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 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:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Sep 25 17:17:45 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: bci/bci-micro:%OS_VERSION_ID_SP% bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-micro:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="micro-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker">
       <containerconfig
           name="bci/bci-micro"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%">
+          tag="%OS_VERSION_ID_SP%.%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.micro">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/minimal-image/minimal-image.changes b/minimal-image/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:42:37 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: bci/bci-minimal:%OS_VERSION_ID_SP% bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-minimal:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="minimal-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker" derived_from="obsrepositories:/bci/bci-micro#15.5">
       <containerconfig
           name="bci/bci-minimal"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%">
+          tag="%OS_VERSION_ID_SP%.%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.minimal">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/nodejs-18-image/Dockerfile b/nodejs-18-image/Dockerfile
@@ -15,11 +15,11 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/nodejs:18
 #!BuildTag: bci/nodejs:18-%RELEASE%
+#!BuildTag: bci/nodejs:18
 #!BuildTag: bci/nodejs:%%nodejs_version%%
-#!BuildTag: bci/node:18
 #!BuildTag: bci/node:18-%RELEASE%
+#!BuildTag: bci/node:18
 #!BuildTag: bci/node:%%nodejs_version%%
 #!BuildName: bci-nodejs-18
 #!BuildVersion: 15.5.18

diff --git a/nodejs-18-image/nodejs-18-image.changes b/nodejs-18-image/nodejs-18-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
-#!BuildTag: bci/openjdk-devel:11
 #!BuildTag: bci/openjdk-devel:11-%RELEASE%
+#!BuildTag: bci/openjdk-devel:11
 #!BuildName: bci-openjdk-devel-11
 #!BuildVersion: 15.5.11
 FROM bci/openjdk:11

diff --git a/openjdk-11-devel-image/openjdk-11-devel-image.changes b/openjdk-11-devel-image/openjdk-11-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:42:37 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/openjdk-11-image/Dockerfile b/openjdk-11-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
-#!BuildTag: bci/openjdk:11
 #!BuildTag: bci/openjdk:11-%RELEASE%
+#!BuildTag: bci/openjdk:11
 #!BuildName: bci-openjdk-11
 #!BuildVersion: 15.5.11
 FROM registry.suse.com/bci/bci-base:15.5

diff --git a/openjdk-11-image/openjdk-11-image.changes b/openjdk-11-image/openjdk-11-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/openjdk-17-devel-image/Dockerfile b/openjdk-17-devel-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
-#!BuildTag: bci/openjdk-devel:17
 #!BuildTag: bci/openjdk-devel:17-%RELEASE%
+#!BuildTag: bci/openjdk-devel:17
 #!BuildName: bci-openjdk-devel-17
 #!BuildVersion: 15.5.17
 FROM bci/openjdk:17

diff --git a/openjdk-17-devel-image/openjdk-17-devel-image.changes b/openjdk-17-devel-image/openjdk-17-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:42:37 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/openjdk-17-image/Dockerfile b/openjdk-17-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
-#!BuildTag: bci/openjdk:17
 #!BuildTag: bci/openjdk:17-%RELEASE%
+#!BuildTag: bci/openjdk:17
 #!BuildName: bci-openjdk-17
 #!BuildVersion: 15.5.17
 FROM registry.suse.com/bci/bci-base:15.5

diff --git a/openjdk-17-image/openjdk-17-image.changes b/openjdk-17-image/openjdk-17-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: suse/postgres:15
 #!BuildTag: suse/postgres:15-%RELEASE%
+#!BuildTag: suse/postgres:15
 #!BuildTag: suse/postgres:%%pg_minor_version%%
 #!BuildTag: suse/postgres:%%pg_patch_version%%
 #!BuildName: suse-postgres-15

diff --git a/postgres-15-image/postgres-15-image.changes b/postgres-15-image/postgres-15-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/sle15-kernel-module-devel-image/Dockerfile b/sle15-kernel-module-devel-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/bci-sle15-kernel-module-devel:%OS_VERSION_ID_SP%
 #!BuildTag: bci/bci-sle15-kernel-module-devel:%OS_VERSION_ID_SP%.%RELEASE%
+#!BuildTag: bci/bci-sle15-kernel-module-devel:%OS_VERSION_ID_SP%
 #!BuildName: bci-bci-sle15-kernel-module-devel-%OS_VERSION_ID_SP%
 #!BuildVersion: 15.5
 FROM registry.suse.com/bci/bci-base:15.5

diff --git a/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes b/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <[email protected]>