🤖: Update build recipes from templates

SUSE · Sep 20, 2024 · e0103c4 · e0103c4
1 parent e93097f
commit e0103c4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -17,8 +17,8 @@
 
 #!BuildTag: bci/gcc:13
 #!BuildTag: bci/gcc:13-%RELEASE%
-#!BuildTag: bci/gcc:%%gcc_version%%
-#!BuildTag: bci/gcc:%%gcc_version%%-%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
@@ -31,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make curl fi
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI GNU Compiler Collection"
 LABEL org.opencontainers.image.description="GNU Compiler Collection container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="13"
+LABEL org.opencontainers.image.version="%%gcc_minor_version%%"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
@@ -45,7 +45,7 @@ LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterpri
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
-ENV GCC_VERSION="%%gcc_version%%"
+ENV GCC_VERSION="%%gcc_minor_version%%"
 
 # symlink all versioned gcc & g++ binaries to unversioned
 # ones in /usr/local/bin so that plain gcc works

diff --git a/gcc-13-image/_service b/gcc-13-image/_service
@@ -3,7 +3,7 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%gcc_version%%</param>
+    <param name="regex">%%gcc_minor_version%%</param>
     <param name="package">gcc13</param>
     <param name="parse-version">minor</param>
   </service>

diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile
@@ -17,8 +17,8 @@
 
 #!BuildTag: bci/gcc:7
 #!BuildTag: bci/gcc:7-%RELEASE%
-#!BuildTag: bci/gcc:%%gcc_version%%
-#!BuildTag: bci/gcc:%%gcc_version%%-%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
@@ -30,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends gcc7 gcc7-c++ make gcc gcc-c
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI GNU Compiler Collection"
 LABEL org.opencontainers.image.description="GNU Compiler Collection container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="7"
+LABEL org.opencontainers.image.version="%%gcc_minor_version%%"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
@@ -44,5 +44,5 @@ LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterpri
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
-ENV GCC_VERSION="%%gcc_version%%"
+ENV GCC_VERSION="%%gcc_minor_version%%"
 
diff --git a/gcc-7-image/_service b/gcc-7-image/_service
@@ -3,7 +3,7 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%gcc_version%%</param>
+    <param name="regex">%%gcc_minor_version%%</param>
     <param name="package">gcc7</param>
     <param name="parse-version">minor</param>
   </service>