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

🤖: Update build recipes for SP7
SUSE · Oct 29, 2024 · 768b1c1 · 768b1c1
2 parents e3f8d12 + 730f755
commit 768b1c1
Show file tree

Hide file tree

Showing 57 changed files with 150 additions and 37 deletions.
diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: x86_64
 #!BuildTag: bci/dotnet-aspnet:6.0.35-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:6.0.35
-#!BuildTag: bci/dotnet-aspnet:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:6.0
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: x86_64
 #!BuildTag: bci/dotnet-aspnet:8.0.10-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:8.0.10
-#!BuildTag: bci/dotnet-aspnet:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-aspnet:8.0
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: x86_64
 #!BuildTag: bci/dotnet-sdk:6.0.35-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:6.0.35
-#!BuildTag: bci/dotnet-sdk:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:6.0
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: x86_64
 #!BuildTag: bci/dotnet-sdk:8.0.10-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:8.0.10
-#!BuildTag: bci/dotnet-sdk:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-sdk:8.0
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: x86_64
 #!BuildTag: bci/dotnet-runtime:6.0.35-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:6.0.35
-#!BuildTag: bci/dotnet-runtime:6.0-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:6.0
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: x86_64
 #!BuildTag: bci/dotnet-runtime:8.0.10-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:8.0.10
-#!BuildTag: bci/dotnet-runtime:8.0-%RELEASE%
 #!BuildTag: bci/dotnet-runtime:8.0
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/gcc-14-image/Dockerfile b/gcc-14-image/Dockerfile
@@ -17,14 +17,13 @@
 
 #!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
 #!BuildTag: bci/gcc:%%gcc_minor_version%%
-#!BuildTag: bci/gcc:14-%RELEASE%
 #!BuildTag: bci/gcc:14
 #!BuildName: bci-gcc-14
 #!BuildVersion: 15.7.14
 FROM bci/bci-base:15.7
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends gcc14 gcc14-c++ make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
+    zypper -n install --no-recommends gcc14 gcc14-c++ gcc14-fortran make curl findutils gawk git-core procps lifecycle-data-sle-module-development-tools; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
@@ -52,6 +51,6 @@ ENV GCC_VERSION="%%gcc_minor_version%%"
 
 # symlink all versioned gcc & g++ binaries to unversioned
 # ones in /usr/local/bin so that plain gcc works
-RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc14 gcc14-c++ |grep ^/usr/bin/ ); do \
+RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc14 gcc14-c++ gcc14-fortran |grep ^/usr/bin/ ); do \
         ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-14$||'); \
     done
diff --git a/gcc-14-image/README.md b/gcc-14-image/README.md
@@ -60,10 +60,9 @@ using `zypper`. This includes the following:
 ### Available compiler frontends
 
 The GNU Compiler Collections supports a wide range of frontends. The container
-image ships the C and C++ frontends available as `gcc` and `g++`
+image ships the C,  C++  and fortran frontends available as `gcc`, `g++` and `gfortran`
 respectively. The following additional frontends can be installed from the
 repository:
-- `gcc14-fortran` for Fortran support
 
 
 ### Using the container image interactively

diff --git a/gcc-14-image/gcc-14-image.changes b/gcc-14-image/gcc-14-image.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:45 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- add fortran
+
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Fri Oct 25 05:40:13 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/git-image/git-image.changes b/git-image/git-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[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_version%%-%RELEASE% suse/git:%%git_version%% suse/git:2.43-%RELEASE% suse/git:2.43 suse/git:%%git_major_version%% -->
+<!-- OBS-AddTag: suse/git:%%git_version%%-%RELEASE% suse/git:%%git_version%% suse/git:2.43 suse/git:%%git_major_version%% -->
 <!-- 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_version%%-%RELEASE%"
-          additionaltags="%%git_version%%,2.43-%RELEASE%,2.43,%%git_major_version%%">
+          additionaltags="%%git_version%%,2.43,%%git_major_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
@@ -19,7 +19,6 @@
 #!BuildTag: bci/golang:oldstable
 #!BuildTag: bci/golang:%%golang_version%%-2.%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%
-#!BuildTag: bci/golang:1.22-2.%RELEASE%
 #!BuildTag: bci/golang:1.22
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -19,7 +19,6 @@
 #!BuildTag: bci/golang:oldstable-openssl
 #!BuildTag: bci/golang:%%golang_version%%-openssl-%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%-openssl
-#!BuildTag: bci/golang:1.20-openssl-%RELEASE%
 #!BuildTag: bci/golang:1.20-openssl
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -19,7 +19,6 @@
 #!BuildTag: bci/golang:stable
 #!BuildTag: bci/golang:%%golang_version%%-1.%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%
-#!BuildTag: bci/golang:1.23-1.%RELEASE%
 #!BuildTag: bci/golang:1.23
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -19,7 +19,6 @@
 #!BuildTag: bci/golang:stable-openssl
 #!BuildTag: bci/golang:%%golang_version%%-openssl-%RELEASE%
 #!BuildTag: bci/golang:%%golang_version%%-openssl
-#!BuildTag: bci/golang:1.21-openssl-%RELEASE%
 #!BuildTag: bci/golang:1.21-openssl
 #!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 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

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

diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 21 07:26:24 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -17,11 +17,9 @@
 
 #!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
 #!BuildTag: bci/nodejs:%%nodejs_version%%
-#!BuildTag: bci/nodejs:20-%RELEASE%
 #!BuildTag: bci/nodejs:20
 #!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
 #!BuildTag: bci/node:%%nodejs_version%%
-#!BuildTag: bci/node:20-%RELEASE%
 #!BuildTag: bci/node:20
 #!BuildName: bci-nodejs-20
 #!BuildVersion: 15.7.20

diff --git a/nodejs-20-image/nodejs-20-image.changes b/nodejs-20-image/nodejs-20-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/openjdk-21-devel-image/Dockerfile b/openjdk-21-devel-image/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
 #!BuildTag: bci/openjdk-devel:%%java_version%%-%RELEASE%
 #!BuildTag: bci/openjdk-devel:%%java_version%%
-#!BuildTag: bci/openjdk-devel:21-%RELEASE%
 #!BuildTag: bci/openjdk-devel:21
 #!BuildTag: bci/openjdk-devel:latest
 #!BuildName: bci-openjdk-devel-21

diff --git a/openjdk-21-devel-image/openjdk-21-devel-image.changes b/openjdk-21-devel-image/openjdk-21-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/openjdk-21-image/Dockerfile b/openjdk-21-image/Dockerfile
@@ -17,7 +17,6 @@
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
 #!BuildTag: bci/openjdk:%%java_version%%-%RELEASE%
 #!BuildTag: bci/openjdk:%%java_version%%
-#!BuildTag: bci/openjdk:21-%RELEASE%
 #!BuildTag: bci/openjdk:21
 #!BuildTag: bci/openjdk:latest
 #!BuildName: bci-openjdk-21

diff --git a/openjdk-21-image/openjdk-21-image.changes b/openjdk-21-image/openjdk-21-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

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

diff --git a/php-apache8-image/php-apache8-image.changes b/php-apache8-image/php-apache8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

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

diff --git a/php-fpm8-image/php-fpm8-image.changes b/php-fpm8-image/php-fpm8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

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

diff --git a/php8-image/php8-image.changes b/php8-image/php8-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/postgres-16-image/Dockerfile b/postgres-16-image/Dockerfile
@@ -17,7 +17,6 @@
 
 #!BuildTag: suse/postgres:%%pg_patch_version%%-%RELEASE%
 #!BuildTag: suse/postgres:%%pg_patch_version%%
-#!BuildTag: suse/postgres:16-%RELEASE%
 #!BuildTag: suse/postgres:16
 #!BuildTag: suse/postgres:%%pg_minor_version%%
 #!BuildTag: suse/postgres:latest

diff --git a/postgres-16-image/postgres-16-image.changes b/postgres-16-image/postgres-16-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 29 15:26:38 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- drop tag_version-%RELEASE%
+
 -------------------------------------------------------------------
 Mon Oct 14 11:26:06 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile
@@ -17,7 +17,6 @@
 
 #!BuildTag: bci/python:%%py311_ver%%-%RELEASE%
 #!BuildTag: bci/python:%%py311_ver%%
-#!BuildTag: bci/python:3.11-%RELEASE%
 #!BuildTag: bci/python:3.11
 #!BuildTag: bci/python:3
 #!BuildName: bci-python-3.11