Merge pull request #1721 from SUSE/for-deploy-6

🤖: Update build recipes for SP6
SUSE · Sep 24, 2024 · b06e757 · b06e757
2 parents 8be5a16 + 94a2fff
commit b06e757
Show file tree

Hide file tree

Showing 64 changed files with 162 additions and 42 deletions.
diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: suse/alertmanager:%%alertmanager_patch_version%%
 #!BuildTag: suse/alertmanager:%%alertmanager_patch_version%%-%RELEASE%
 #!BuildTag: suse/alertmanager:%%alertmanager_minor_version%%
-#!BuildTag: suse/alertmanager:%%alertmanager_minor_version%%-%RELEASE%
 #!BuildTag: suse/alertmanager:latest
 #!BuildName: suse-alertmanager-%%alertmanager_patch_version%%
 #!BuildVersion: 15.6

diff --git a/alertmanager-image/alertmanager-image.changes b/alertmanager-image/alertmanager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/dotnet-aspnet:6.0
 #!BuildTag: bci/dotnet-aspnet:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:6.0.33
-#!BuildTag: bci/dotnet-aspnet:6.0.33-%RELEASE%
 #!BuildName: bci-dotnet-aspnet-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32

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 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Tue Sep 17 07:19:04 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/dotnet-aspnet:8.0
 #!BuildTag: bci/dotnet-aspnet:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:8.0.8
-#!BuildTag: bci/dotnet-aspnet:8.0.8-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:latest
 #!BuildName: bci-dotnet-aspnet-8.0
 #!BuildVersion: 15.6.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 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Tue Sep 17 07:19:04 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%%
 #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE%
 #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_minor_version%%
-#!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_minor_version%%-%RELEASE%
 #!BuildTag: suse/blackbox_exporter:latest
 #!BuildName: suse-blackbox_exporter-%%blackbox_exporter_patch_version%%
 #!BuildVersion: 15.6

diff --git a/blackbox_exporter-image/blackbox_exporter-image.changes b/blackbox_exporter-image/blackbox_exporter-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/dotnet-sdk:6.0
 #!BuildTag: bci/dotnet-sdk:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:6.0.33
-#!BuildTag: bci/dotnet-sdk:6.0.33-%RELEASE%
 #!BuildName: bci-dotnet-sdk-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32

diff --git a/dotnet-6.0/dotnet-6.0.changes b/dotnet-6.0/dotnet-6.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Tue Sep 17 07:19:04 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/dotnet-sdk:8.0
 #!BuildTag: bci/dotnet-sdk:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:8.0.8
-#!BuildTag: bci/dotnet-sdk:8.0.8-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:latest
 #!BuildName: bci-dotnet-sdk-8.0
 #!BuildVersion: 15.6.8.0

diff --git a/dotnet-8.0/dotnet-8.0.changes b/dotnet-8.0/dotnet-8.0.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Tue Sep 17 07:19:04 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/dotnet-runtime:6.0
 #!BuildTag: bci/dotnet-runtime:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:6.0.33
-#!BuildTag: bci/dotnet-runtime:6.0.33-%RELEASE%
 #!BuildName: bci-dotnet-runtime-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32

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 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Tue Sep 17 07:19:04 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/dotnet-runtime:8.0
 #!BuildTag: bci/dotnet-runtime:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:8.0.8
-#!BuildTag: bci/dotnet-runtime:8.0.8-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:latest
 #!BuildName: bci-dotnet-runtime-8.0
 #!BuildVersion: 15.6.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 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Tue Sep 17 07:19:04 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/gcc:13
 #!BuildTag: bci/gcc:13-%RELEASE%
 #!BuildTag: bci/gcc:%%gcc_minor_version%%
-#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
 #!BuildTag: bci/gcc:latest
 #!BuildName: bci-gcc-13
 #!BuildVersion: 15.6.13

diff --git a/gcc-13-image/gcc-13-image.changes b/gcc-13-image/gcc-13-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Mon Sep 23 07:18:14 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/gcc:7
 #!BuildTag: bci/gcc:7-%RELEASE%
 #!BuildTag: bci/gcc:%%gcc_minor_version%%
-#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
 #!BuildName: bci-gcc-7
 #!BuildVersion: 15.6.7
 FROM bci/bci-base:15.6

diff --git a/gcc-7-image/gcc-7-image.changes b/gcc-7-image/gcc-7-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Mon Sep 23 07:18:14 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/git-image/git-image.changes b/git-image/git-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Fri Sep 13 09:55:59 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_major_version%%-%RELEASE% suse/git:%%git_version%% suse/git:%%git_version%%-%RELEASE% suse/git:latest -->
+<!-- OBS-AddTag: suse/git:%%git_minor_version%% suse/git:%%git_minor_version%%-%RELEASE% suse/git:%%git_major_version%% suse/git:%%git_version%% suse/git:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="git-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -28,7 +28,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="suse/git"
           tag="%%git_minor_version%%"
-          additionaltags="%%git_minor_version%%-%RELEASE%,%%git_major_version%%,%%git_major_version%%-%RELEASE%,%%git_version%%,%%git_version%%-%RELEASE%,latest">
+          additionaltags="%%git_minor_version%%-%RELEASE%,%%git_major_version%%,%%git_version%%,latest">
         <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
@@ -20,7 +20,6 @@
 #!BuildTag: bci/golang:1.22
 #!BuildTag: bci/golang:1.22-2.%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%
-#!BuildTag: bci/golang:%%golang_version%%-2.%RELEASE%
 #!BuildName: bci-golang-oldstable
 #!BuildVersion: 15.6.1.22.2
 #!BuildRelease: 33

diff --git a/golang-oldstable-image/golang-oldstable-image.changes b/golang-oldstable-image/golang-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -20,7 +20,6 @@
 #!BuildTag: bci/golang:1.20-openssl
 #!BuildTag: bci/golang:1.20-openssl-%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%
-#!BuildTag: bci/golang:%%golang_version%%-%RELEASE%
 #!BuildName: bci-golang-oldstable-openssl
 #!BuildVersion: 15.6
 #!BuildRelease: 33

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 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -20,7 +20,6 @@
 #!BuildTag: bci/golang:1.23
 #!BuildTag: bci/golang:1.23-1.%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%
-#!BuildTag: bci/golang:%%golang_version%%-1.%RELEASE%
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable
 #!BuildVersion: 15.6.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 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -20,7 +20,6 @@
 #!BuildTag: bci/golang:1.21-openssl
 #!BuildTag: bci/golang:1.21-openssl-%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%
-#!BuildTag: bci/golang:%%golang_version%%-%RELEASE%
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable-openssl
 #!BuildVersion: 15.6

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 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -18,9 +18,7 @@
 #!BuildTag: suse/grafana:%%grafana_patch_version%%
 #!BuildTag: suse/grafana:%%grafana_patch_version%%-%RELEASE%
 #!BuildTag: suse/grafana:%%grafana_minor_version%%
-#!BuildTag: suse/grafana:%%grafana_minor_version%%-%RELEASE%
 #!BuildTag: suse/grafana:%%grafana_major_version%%
-#!BuildTag: suse/grafana:%%grafana_major_version%%-%RELEASE%
 #!BuildTag: suse/grafana:latest
 #!BuildName: suse-grafana-%%grafana_patch_version%%
 #!BuildVersion: 15.6

diff --git a/grafana-image/grafana-image.changes b/grafana-image/grafana-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -18,9 +18,7 @@
 #!BuildTag: bci/kiwi:9
 #!BuildTag: bci/kiwi:9-%RELEASE%
 #!BuildTag: bci/kiwi:9.24
-#!BuildTag: bci/kiwi:9.24-%RELEASE%
 #!BuildTag: bci/kiwi:9.24.43
-#!BuildTag: bci/kiwi:9.24.43-%RELEASE%
 #!BuildTag: bci/kiwi:latest
 #!BuildName: bci-kiwi-9
 #!BuildVersion: 15.6.9

diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 19 15:50:32 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -18,12 +18,10 @@
 #!BuildTag: bci/nodejs:20
 #!BuildTag: bci/nodejs:20-%RELEASE%
 #!BuildTag: bci/nodejs:%%nodejs_version%%
-#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
 #!BuildTag: bci/nodejs:latest
 #!BuildTag: bci/node:20
 #!BuildTag: bci/node:20-%RELEASE%
 #!BuildTag: bci/node:%%nodejs_version%%
-#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
 #!BuildTag: bci/node:latest
 #!BuildName: bci-nodejs-20
 #!BuildVersion: 15.6.20

diff --git a/nodejs-20-image/nodejs-20-image.changes b/nodejs-20-image/nodejs-20-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -18,9 +18,7 @@
 #!BuildTag: suse/pcp:5.3.7
 #!BuildTag: suse/pcp:5.3.7-%RELEASE%
 #!BuildTag: suse/pcp:5.3
-#!BuildTag: suse/pcp:5.3-%RELEASE%
 #!BuildTag: suse/pcp:5
-#!BuildTag: suse/pcp:5-%RELEASE%
 #!BuildTag: suse/pcp:latest
 #!BuildName: suse-pcp-5.3.7
 #!BuildVersion: 15.6.5.3.7

diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/php-apache:8
 #!BuildTag: bci/php-apache:8-%RELEASE%
 #!BuildTag: bci/php-apache:%%php_version%%
-#!BuildTag: bci/php-apache:%%php_version%%-%RELEASE%
 #!BuildTag: bci/php-apache:latest
 #!BuildName: bci-php-apache-8
 #!BuildVersion: 15.6.8

diff --git a/php-apache8-image/php-apache8-image.changes b/php-apache8-image/php-apache8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/php-fpm:8
 #!BuildTag: bci/php-fpm:8-%RELEASE%
 #!BuildTag: bci/php-fpm:%%php_version%%
-#!BuildTag: bci/php-fpm:%%php_version%%-%RELEASE%
 #!BuildTag: bci/php-fpm:latest
 #!BuildName: bci-php-fpm-8
 #!BuildVersion: 15.6.8

diff --git a/php-fpm8-image/php-fpm8-image.changes b/php-fpm8-image/php-fpm8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile
@@ -18,7 +18,6 @@
 #!BuildTag: bci/php:8
 #!BuildTag: bci/php:8-%RELEASE%
 #!BuildTag: bci/php:%%php_version%%
-#!BuildTag: bci/php:%%php_version%%-%RELEASE%
 #!BuildTag: bci/php:latest
 #!BuildName: bci-php-8
 #!BuildVersion: 15.6.8

diff --git a/php8-image/php8-image.changes b/php8-image/php8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 24 20:00:34 UTC 2024 - Dirk Mueller <[email protected]>
+
+- remove release tags for additional_versions
+
 -------------------------------------------------------------------
 Thu Sep 12 10:37:23 UTC 2024 - Dirk Mueller <[email protected]>