Test build for #1855

SUSE · Oct 14, 2024 · 3d9aa6e · 3d9aa6e
1 parent 67efb89
commit 3d9aa6e
Show file tree

Hide file tree

Showing 40 changed files with 158 additions and 115 deletions.
diff --git a/apache-tomcat-10-image/Dockerfile.openjdk17 b/apache-tomcat-10-image/Dockerfile.openjdk17
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk17-%RELEASE%
 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk17
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10.1-openjdk17-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk17-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk17-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-10-image/Dockerfile.openjdk21 b/apache-tomcat-10-image/Dockerfile.openjdk21
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21
 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk21-%RELEASE%
 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk21
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10.1-openjdk21-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk21-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk21-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-10-image/Dockerfile.openjdk22 b/apache-tomcat-10-image/Dockerfile.openjdk22
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22
 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk22-%RELEASE%
 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk22
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22
 #!BuildTag: opensuse/apache-tomcat:latest
 
 FROM opensuse/bci/bci-micro:latest AS target
@@ -41,8 +42,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10.1-openjdk22-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk22-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-9-image/Dockerfile.openjdk17 b/apache-tomcat-9-image/Dockerfile.openjdk17
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
 #!BuildTag: opensuse/apache-tomcat:9-openjdk17-%RELEASE%
 #!BuildTag: opensuse/apache-tomcat:9-openjdk17
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="9-openjdk17-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk17-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/gcc-12-image/Dockerfile b/gcc-12-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%
 #!BuildTag: opensuse/bci/gcc:12-%RELEASE%
 #!BuildTag: opensuse/bci/gcc:12
-#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%
 
 FROM opensuse/tumbleweed:latest
 
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="12-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:12-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%
 #!BuildTag: opensuse/bci/gcc:13-%RELEASE%
 #!BuildTag: opensuse/bci/gcc:13
-#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%
 
 FROM opensuse/tumbleweed:latest
 
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="13-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:13-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/gcc-14-image/Dockerfile b/gcc-14-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%
 #!BuildTag: opensuse/bci/gcc:14-%RELEASE%
 #!BuildTag: opensuse/bci/gcc:14
-#!BuildTag: opensuse/bci/gcc:%%gcc_minor_version%%
 #!BuildTag: opensuse/bci/gcc:latest
 
 FROM opensuse/tumbleweed:latest
@@ -37,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="14-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:14-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/git-image/_service b/git-image/_service
@@ -12,10 +12,4 @@
     <param name="package">git-core</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">git-image.kiwi</param>
-    <param name="regex">%%git_minor_version%%</param>
-    <param name="package">git-core</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>
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: opensuse/git:%%git_minor_version%%-%RELEASE% opensuse/git:%%git_minor_version%% opensuse/git:%%git_major_version%% opensuse/git:%%git_version%% opensuse/git:latest -->
+<!-- OBS-AddTag: opensuse/git:%%git_version%%-%RELEASE% opensuse/git:%%git_version%% opensuse/git:2.47-%RELEASE% opensuse/git:2.47 opensuse/git:%%git_major_version%% opensuse/git:latest -->
 <!-- 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:/opensuse/bci/bci-micro#latest">
       <containerconfig
           name="opensuse/git"
-          tag="%%git_minor_version%%-%RELEASE%"
-          additionaltags="%%git_minor_version%%,%%git_major_version%%,%%git_version%%,latest">
+          tag="%%git_version%%-%RELEASE%"
+          additionaltags="%%git_version%%,2.47-%RELEASE%,2.47,%%git_major_version%%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.git">
             <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
@@ -39,8 +39,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
-            <label name="org.opencontainers.image.ref.name" value="%%git_minor_version%%-%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/git:%%git_minor_version%%-%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%%git_version%%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/git:%%git_version%%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: opensuse/bci/golang:oldstable-2.%RELEASE%
 #!BuildTag: opensuse/bci/golang:oldstable
+#!BuildTag: opensuse/bci/golang:%%golang_version%%-2.%RELEASE%
+#!BuildTag: opensuse/bci/golang:%%golang_version%%
 #!BuildTag: opensuse/bci/golang:1.22-2.%RELEASE%
 #!BuildTag: opensuse/bci/golang:1.22
-#!BuildTag: opensuse/bci/golang:%%golang_version%%
 
 FROM opensuse/tumbleweed:latest
 
@@ -38,8 +39,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.22-2.%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.22-2.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-2.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:%%golang_version%%-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
 #!BuildTag: opensuse/bci/golang:stable
+#!BuildTag: opensuse/bci/golang:%%golang_version%%-1.%RELEASE%
+#!BuildTag: opensuse/bci/golang:%%golang_version%%
 #!BuildTag: opensuse/bci/golang:1.23-1.%RELEASE%
 #!BuildTag: opensuse/bci/golang:1.23
-#!BuildTag: opensuse/bci/golang:%%golang_version%%
 #!BuildTag: opensuse/bci/golang:latest
 
 FROM opensuse/tumbleweed:latest
@@ -39,8 +40,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.23-1.%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.23-1.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:%%golang_version%%-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/bci/kiwi:10.1.11-%RELEASE%
+#!BuildTag: opensuse/bci/kiwi:10.1.11
 #!BuildTag: opensuse/bci/kiwi:10-%RELEASE%
 #!BuildTag: opensuse/bci/kiwi:10
 #!BuildTag: opensuse/bci/kiwi:10.1
-#!BuildTag: opensuse/bci/kiwi:10.1.11
 #!BuildTag: opensuse/bci/kiwi:latest
 
 FROM opensuse/tumbleweed:latest
@@ -38,8 +39,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/kiwi:10-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="10.1.11-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/kiwi:10.1.11-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/mariadb-client-image/Dockerfile b/mariadb-client-image/Dockerfile
@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/mariadb-client:%%mariadb_version%%-%RELEASE%
+#!BuildTag: opensuse/mariadb-client:%%mariadb_version%%
 #!BuildTag: opensuse/mariadb-client:11.5-%RELEASE%
 #!BuildTag: opensuse/mariadb-client:11.5
 #!BuildTag: opensuse/mariadb-client:latest
@@ -36,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="11.5-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:11.5-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%mariadb_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:%%mariadb_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/mariadb-image/Dockerfile b/mariadb-image/Dockerfile
@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/mariadb:%%mariadb_version%%-%RELEASE%
+#!BuildTag: opensuse/mariadb:%%mariadb_version%%
 #!BuildTag: opensuse/mariadb:11.5-%RELEASE%
 #!BuildTag: opensuse/mariadb:11.5
 #!BuildTag: opensuse/mariadb:latest
@@ -36,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="11.5-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.5-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%mariadb_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:%%mariadb_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -15,13 +15,15 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
 #!BuildTag: opensuse/bci/nodejs:20-%RELEASE%
 #!BuildTag: opensuse/bci/nodejs:20
-#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
 #!BuildTag: opensuse/bci/nodejs:latest
+#!BuildTag: opensuse/bci/node:%%nodejs_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/node:%%nodejs_version%%
 #!BuildTag: opensuse/bci/node:20-%RELEASE%
 #!BuildTag: opensuse/bci/node:20
-#!BuildTag: opensuse/bci/node:%%nodejs_version%%
 #!BuildTag: opensuse/bci/node:latest
 
 FROM opensuse/tumbleweed:latest
@@ -41,8 +43,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="20-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/nodejs:20-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%nodejs_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/nodejs-22-image/Dockerfile b/nodejs-22-image/Dockerfile
@@ -15,12 +15,14 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
 #!BuildTag: opensuse/bci/nodejs:22-%RELEASE%
 #!BuildTag: opensuse/bci/nodejs:22
-#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
+#!BuildTag: opensuse/bci/node:%%nodejs_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/node:%%nodejs_version%%
 #!BuildTag: opensuse/bci/node:22-%RELEASE%
 #!BuildTag: opensuse/bci/node:22
-#!BuildTag: opensuse/bci/node:%%nodejs_version%%
 
 FROM opensuse/tumbleweed:latest
 
@@ -39,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="22-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/nodejs:22-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%nodejs_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile
@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
+#!BuildTag: opensuse/bci/openjdk-devel:%%java_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/openjdk-devel:%%java_version%%
 #!BuildTag: opensuse/bci/openjdk-devel:11-%RELEASE%
 #!BuildTag: opensuse/bci/openjdk-devel:11
 
@@ -35,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="11-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/openjdk-devel:11-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/openjdk-devel:%%java_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"