Merge pull request #1843 from SUSE/for-deploy-7

🤖: Update build recipes for SP7
SUSE · Oct 11, 2024 · 893a384 · 893a384
2 parents a441632 + 2730c96
commit 893a384
Show file tree

Hide file tree

Showing 90 changed files with 291 additions and 66 deletions.
diff --git a/389-ds-container/389-ds-container.changes b/389-ds-container/389-ds-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:38:58 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: suse/389-ds:%%389ds_version%%
 #!BuildTag: suse/389-ds:%%389ds_version%%-%RELEASE%
+#!BuildTag: suse/389-ds:%%389ds_version%%
 #!BuildName: suse-389-ds-%%389ds_version%%
 #!BuildVersion: 15.7
 FROM suse/sle15:15.7

diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: suse/alertmanager:%%alertmanager_patch_version%%
 #!BuildTag: suse/alertmanager:%%alertmanager_patch_version%%-%RELEASE%
+#!BuildTag: suse/alertmanager:%%alertmanager_patch_version%%
 #!BuildTag: suse/alertmanager:%%alertmanager_minor_version%%
 #!BuildName: suse-alertmanager-%%alertmanager_patch_version%%
 #!BuildVersion: 15.7

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

diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
-#!BuildTag: bci/dotnet-aspnet:6.0
 #!BuildTag: bci/dotnet-aspnet:6.0-%RELEASE%
+#!BuildTag: bci/dotnet-aspnet:6.0
 #!BuildTag: bci/dotnet-aspnet:6.0.35
 #!BuildName: bci-dotnet-aspnet-6.0
 #!BuildVersion: 15.7.6.0

diff --git a/aspnet-runtime-6.0/aspnet-runtime-6.0.changes b/aspnet-runtime-6.0/aspnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Oct  9 05:45:41 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
-#!BuildTag: bci/dotnet-aspnet:8.0
 #!BuildTag: bci/dotnet-aspnet:8.0-%RELEASE%
+#!BuildTag: bci/dotnet-aspnet:8.0
 #!BuildTag: bci/dotnet-aspnet:8.0.10
 #!BuildName: bci-dotnet-aspnet-8.0
 #!BuildVersion: 15.7.8.0

diff --git a/aspnet-runtime-8.0/aspnet-runtime-8.0.changes b/aspnet-runtime-8.0/aspnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Oct  9 05:33:48 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%%
 #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE%
+#!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%%
 #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_minor_version%%
 #!BuildName: suse-blackbox_exporter-%%blackbox_exporter_patch_version%%
 #!BuildVersion: 15.7

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

diff --git a/busybox-image/busybox-image.changes b/busybox-image/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Fri Oct 11 14:59:44 UTC 2024 - SUSE Update Bot <[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/distribution-image/distribution-image.changes b/distribution-image/distribution-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Tue Oct  1 09:38:58 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/distribution-image/distribution-image.kiwi b/distribution-image/distribution-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: suse/registry:%%registry_version%% suse/registry:%%registry_version%%-%RELEASE% -->
+<!-- OBS-AddTag: suse/registry:%%registry_version%%-%RELEASE% suse/registry:%%registry_version%% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="registry-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.7">
       <containerconfig
           name="suse/registry"
-          tag="%%registry_version%%"
-          additionaltags="%%registry_version%%-%RELEASE%"
+          tag="%%registry_version%%-%RELEASE%"
+          additionaltags="%%registry_version%%"
           user="registry">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.application.registry">

diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
-#!BuildTag: bci/dotnet-sdk:6.0
 #!BuildTag: bci/dotnet-sdk:6.0-%RELEASE%
+#!BuildTag: bci/dotnet-sdk:6.0
 #!BuildTag: bci/dotnet-sdk:6.0.35
 #!BuildName: bci-dotnet-sdk-6.0
 #!BuildVersion: 15.7.6.0

diff --git a/dotnet-6.0/dotnet-6.0.changes b/dotnet-6.0/dotnet-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Oct  9 05:45:41 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
-#!BuildTag: bci/dotnet-sdk:8.0
 #!BuildTag: bci/dotnet-sdk:8.0-%RELEASE%
+#!BuildTag: bci/dotnet-sdk:8.0
 #!BuildTag: bci/dotnet-sdk:8.0.10
 #!BuildName: bci-dotnet-sdk-8.0
 #!BuildVersion: 15.7.8.0

diff --git a/dotnet-8.0/dotnet-8.0.changes b/dotnet-8.0/dotnet-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Oct  9 05:33:48 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
-#!BuildTag: bci/dotnet-runtime:6.0
 #!BuildTag: bci/dotnet-runtime:6.0-%RELEASE%
+#!BuildTag: bci/dotnet-runtime:6.0
 #!BuildTag: bci/dotnet-runtime:6.0.35
 #!BuildName: bci-dotnet-runtime-6.0
 #!BuildVersion: 15.7.6.0

diff --git a/dotnet-runtime-6.0/dotnet-runtime-6.0.changes b/dotnet-runtime-6.0/dotnet-runtime-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Oct  9 05:45:41 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: x86_64
-#!BuildTag: bci/dotnet-runtime:8.0
 #!BuildTag: bci/dotnet-runtime:8.0-%RELEASE%
+#!BuildTag: bci/dotnet-runtime:8.0
 #!BuildTag: bci/dotnet-runtime:8.0.10
 #!BuildName: bci-dotnet-runtime-8.0
 #!BuildVersion: 15.7.8.0

diff --git a/dotnet-runtime-8.0/dotnet-runtime-8.0.changes b/dotnet-runtime-8.0/dotnet-runtime-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- make the tag with -%RELEASE% the first tag listed
+
 -------------------------------------------------------------------
 Wed Oct  9 05:33:48 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/gcc:13
 #!BuildTag: bci/gcc:13-%RELEASE%
+#!BuildTag: bci/gcc:13
 #!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildName: bci-gcc-13
 #!BuildVersion: 15.7.13

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

diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/gcc:7
 #!BuildTag: bci/gcc:7-%RELEASE%
+#!BuildTag: bci/gcc:7
 #!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildName: bci-gcc-7
 #!BuildVersion: 15.7.7

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

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

diff --git a/git-image/git-image.kiwi b/git-image/git-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: suse/git:%%git_minor_version%% suse/git:%%git_minor_version%%-%RELEASE% suse/git:%%git_major_version%% suse/git:%%git_version%% -->
+<!-- OBS-AddTag: suse/git:%%git_minor_version%%-%RELEASE% suse/git:%%git_minor_version%% suse/git:%%git_major_version%% suse/git:%%git_version%% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="git-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.7">
       <containerconfig
           name="suse/git"
-          tag="%%git_minor_version%%"
-          additionaltags="%%git_minor_version%%-%RELEASE%,%%git_major_version%%,%%git_version%%">
+          tag="%%git_minor_version%%-%RELEASE%"
+          additionaltags="%%git_minor_version%%,%%git_major_version%%,%%git_version%%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.application.git">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -15,10 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/golang:oldstable
 #!BuildTag: bci/golang:oldstable-2.%RELEASE%
-#!BuildTag: bci/golang:1.22
+#!BuildTag: bci/golang:oldstable
 #!BuildTag: bci/golang:1.22-2.%RELEASE%
+#!BuildTag: bci/golang:1.22
 #!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-oldstable
 #!BuildVersion: 15.7.1.22.2

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

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -15,10 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/golang:oldstable-openssl
 #!BuildTag: bci/golang:oldstable-openssl-%RELEASE%
-#!BuildTag: bci/golang:1.20-openssl
+#!BuildTag: bci/golang:oldstable-openssl
 #!BuildTag: bci/golang:1.20-openssl-%RELEASE%
+#!BuildTag: bci/golang:1.20-openssl
 #!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-oldstable-openssl
 #!BuildVersion: 15.7

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

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -15,10 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/golang:stable
 #!BuildTag: bci/golang:stable-1.%RELEASE%
-#!BuildTag: bci/golang:1.23
+#!BuildTag: bci/golang:stable
 #!BuildTag: bci/golang:1.23-1.%RELEASE%
+#!BuildTag: bci/golang:1.23
 #!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-stable
 #!BuildVersion: 15.7.1.23.1

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

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -15,10 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/golang:stable-openssl
 #!BuildTag: bci/golang:stable-openssl-%RELEASE%
-#!BuildTag: bci/golang:1.21-openssl
+#!BuildTag: bci/golang:stable-openssl
 #!BuildTag: bci/golang:1.21-openssl-%RELEASE%
+#!BuildTag: bci/golang:1.21-openssl
 #!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-stable-openssl
 #!BuildVersion: 15.7

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

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: suse/grafana:%%grafana_patch_version%%
 #!BuildTag: suse/grafana:%%grafana_patch_version%%-%RELEASE%
+#!BuildTag: suse/grafana:%%grafana_patch_version%%
 #!BuildTag: suse/grafana:%%grafana_minor_version%%
 #!BuildTag: suse/grafana:%%grafana_major_version%%
 #!BuildName: suse-grafana-%%grafana_patch_version%%