From c353cba8de1e5fdc406add2b1ebfebb4e7e8374f Mon Sep 17 00:00:00 2001
From: SUSE Update Bot <bci-internal@suse.de>
Date: Fri, 11 Oct 2024 15:08:30 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?=
 =?UTF-8?q?from=20templates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 busybox-image/busybox-image.kiwi           | 6 +++---
 init-image/Dockerfile                      | 2 +-
 micro-image/micro-image.kiwi               | 6 +++---
 minimal-image/minimal-image.kiwi           | 6 +++---
 nodejs-18-image/Dockerfile                 | 4 ++--
 openjdk-11-devel-image/Dockerfile          | 2 +-
 openjdk-11-image/Dockerfile                | 2 +-
 openjdk-17-devel-image/Dockerfile          | 2 +-
 openjdk-17-image/Dockerfile                | 2 +-
 postgres-15-image/Dockerfile               | 2 +-
 sle15-kernel-module-devel-image/Dockerfile | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi
index cf51b49bf..bc84a58d7 100644
--- 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
index 3f0bdb66a..e34c74dfe 100644
--- 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/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi
index 3ca9acabd..ef93bbf10 100644
--- 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.kiwi b/minimal-image/minimal-image.kiwi
index ddb52bed9..7f50b8757 100644
--- 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
index 172a39ea8..685341266 100644
--- 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/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile
index 9a0c352e0..8023e52bb 100644
--- 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-image/Dockerfile b/openjdk-11-image/Dockerfile
index 328ed81dc..f4d0c7db7 100644
--- 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-17-devel-image/Dockerfile b/openjdk-17-devel-image/Dockerfile
index a4a161a54..078ee321e 100644
--- 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-image/Dockerfile b/openjdk-17-image/Dockerfile
index fcd87ea65..e744a2574 100644
--- 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/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile
index fbaf3cb63..e6758c939 100644
--- 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/sle15-kernel-module-devel-image/Dockerfile b/sle15-kernel-module-devel-image/Dockerfile
index 3b51f4d32..ca18ad552 100644
--- 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

From c215289bc98a484df0a69220431bb3007fabe6ef Mon Sep 17 00:00:00 2001
From: SUSE Update Bot <bci-internal@suse.de>
Date: Fri, 11 Oct 2024 15:13:46 +0000
Subject: [PATCH 2/2] Update changelogs for busybox-image, init-image,
 micro-image, minimal-image, nodejs-18-image, openjdk-11-devel-image,
 openjdk-11-image, openjdk-17-devel-image, openjdk-17-image,
 postgres-15-image, sle15-kernel-module-devel-image

---
 busybox-image/busybox-image.changes                          | 5 +++++
 init-image/init-image.changes                                | 5 +++++
 micro-image/micro-image.changes                              | 5 +++++
 minimal-image/minimal-image.changes                          | 5 +++++
 nodejs-18-image/nodejs-18-image.changes                      | 5 +++++
 openjdk-11-devel-image/openjdk-11-devel-image.changes        | 5 +++++
 openjdk-11-image/openjdk-11-image.changes                    | 5 +++++
 openjdk-17-devel-image/openjdk-17-devel-image.changes        | 5 +++++
 openjdk-17-image/openjdk-17-image.changes                    | 5 +++++
 postgres-15-image/postgres-15-image.changes                  | 5 +++++
 .../sle15-kernel-module-devel-image.changes                  | 5 +++++
 11 files changed, 55 insertions(+)

diff --git a/busybox-image/busybox-image.changes b/busybox-image/busybox-image.changes
index 69a64e7db..102d0be9c 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/init-image/init-image.changes b/init-image/init-image.changes
index bb46b578f..145746d2a 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/micro-image/micro-image.changes b/micro-image/micro-image.changes
index 23e86b022..bce5ffeb3 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/minimal-image/minimal-image.changes b/minimal-image/minimal-image.changes
index e8f8811e2..8ed216730 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:42:37 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/nodejs-18-image/nodejs-18-image.changes b/nodejs-18-image/nodejs-18-image.changes
index b72a0f79c..d5c562bba 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/openjdk-11-devel-image/openjdk-11-devel-image.changes b/openjdk-11-devel-image/openjdk-11-devel-image.changes
index bce4db086..64f6aab3c 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:42:37 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/openjdk-11-image/openjdk-11-image.changes b/openjdk-11-image/openjdk-11-image.changes
index 8ddf924e7..42e8ace99 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/openjdk-17-devel-image/openjdk-17-devel-image.changes b/openjdk-17-devel-image/openjdk-17-devel-image.changes
index 53adac54f..8d26dc9ca 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:42:37 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/openjdk-17-image/openjdk-17-image.changes b/openjdk-17-image/openjdk-17-image.changes
index 2fc5dd3c7..fda373c5a 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/postgres-15-image/postgres-15-image.changes b/postgres-15-image/postgres-15-image.changes
index cdbb86221..bdec6c4f5 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 
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
index 07beed2ed..5aad19354 100644
--- 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 <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Mon Sep 30 14:33:57 UTC 2024 - Dirk Mueller <dmueller@suse.com>