Test build for #1855

SUSE · Oct 14, 2024 · a1b04cd · a1b04cd
1 parent a6b4e21
commit a1b04cd
Show file tree

Hide file tree

Showing 36 changed files with 145 additions and 111 deletions.
diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!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
-#!BuildTag: bci/dotnet-aspnet:6.0.35
 #!BuildName: bci-dotnet-aspnet-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32
@@ -35,8 +36,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="6.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:6.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="6.0.35-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:6.0.35-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2024-11-12"

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!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
-#!BuildTag: bci/dotnet-aspnet:8.0.10
 #!BuildTag: bci/dotnet-aspnet:latest
 #!BuildName: bci-dotnet-aspnet-8.0
 #!BuildVersion: 15.6.8.0
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:8.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="8.0.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-aspnet:8.0.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2026-11-10"

diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!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
-#!BuildTag: bci/dotnet-sdk:6.0.35
 #!BuildName: bci-dotnet-sdk-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32
@@ -35,8 +36,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="6.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:6.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="6.0.35-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:6.0.35-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2024-11-12"

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!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
-#!BuildTag: bci/dotnet-sdk:8.0.10
 #!BuildTag: bci/dotnet-sdk:latest
 #!BuildName: bci-dotnet-sdk-8.0
 #!BuildVersion: 15.6.8.0
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:8.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="8.0.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-sdk:8.0.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2026-11-10"
@@ -71,8 +72,8 @@ COPY dotnet-apphost-pack-8.0-8.0.10-1.x86_64.rpm /tmp/
 COPY aspnetcore-targeting-pack-8.0-8.0.10-1.x86_64.rpm /tmp/
 #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-8.0-8.0.10-1.x86_64.rpm
 COPY aspnetcore-runtime-8.0-8.0.10-1.x86_64.rpm /tmp/
-#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-8.0-8.0.402-1.x86_64.rpm
-COPY dotnet-sdk-8.0-8.0.402-1.x86_64.rpm /tmp/
+#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-8.0-8.0.403-1.x86_64.rpm
+COPY dotnet-sdk-8.0-8.0.403-1.x86_64.rpm /tmp/
 
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487

diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!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
-#!BuildTag: bci/dotnet-runtime:6.0.35
 #!BuildName: bci-dotnet-runtime-6.0
 #!BuildVersion: 15.6.6.0
 #!BuildRelease: 32
@@ -35,8 +36,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="6.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:6.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="6.0.35-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:6.0.35-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2024-11-12"

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 #!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
-#!BuildTag: bci/dotnet-runtime:8.0.10
 #!BuildTag: bci/dotnet-runtime:latest
 #!BuildName: bci-dotnet-runtime-8.0
 #!BuildVersion: 15.6.8.0
@@ -36,8 +37,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="8.0-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:8.0-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="8.0.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/dotnet-runtime:8.0.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.supportlevel.until="2026-11-10"

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
+#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildTag: bci/gcc:13-%RELEASE%
 #!BuildTag: bci/gcc:13
-#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildTag: bci/gcc:latest
 #!BuildName: bci-gcc-13
 #!BuildVersion: 15.6.13
@@ -38,8 +39,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="13-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/gcc:13-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"

diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile
@@ -15,9 +15,10 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE%
+#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildTag: bci/gcc:7-%RELEASE%
 #!BuildTag: bci/gcc:7
-#!BuildTag: bci/gcc:%%gcc_minor_version%%
 #!BuildName: bci-gcc-7
 #!BuildVersion: 15.6.7
 FROM registry.suse.com/bci/bci-base:15.6
@@ -37,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="7-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/gcc:7-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%gcc_minor_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/gcc:%%gcc_minor_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"

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: suse/git:%%git_minor_version%%-%RELEASE% suse/git:%%git_minor_version%% suse/git:%%git_major_version%% suse/git:%%git_version%% suse/git:latest -->
+<!-- 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%% suse/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:/bci/bci-micro#15.6">
       <containerconfig
           name="suse/git"
-          tag="%%git_minor_version%%-%RELEASE%"
-          additionaltags="%%git_minor_version%%,%%git_major_version%%,%%git_version%%,latest">
+          tag="%%git_version%%-%RELEASE%"
+          additionaltags="%%git_version%%,2.43-%RELEASE%,2.43,%%git_major_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/)"/>
@@ -39,8 +39,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <label name="org.opencontainers.image.vendor" value="SUSE LLC"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.suse.com/products/base-container-images/"/>
-            <label name="org.opencontainers.image.ref.name" value="%%git_minor_version%%-%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.suse.com/suse/git:%%git_minor_version%%-%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%%git_version%%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.suse.com/suse/git:%%git_version%%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="com.suse.supportlevel" value="l3"/>
             <label name="com.suse.eula" value="sle-eula"/>

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:oldstable-2.%RELEASE%
 #!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
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-oldstable
 #!BuildVersion: 15.6.1.22.2
 #!BuildRelease: 33
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.22-2.%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.22-2.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-2.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:oldstable-openssl-%RELEASE%
 #!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
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildName: bci-golang-oldstable-openssl
 #!BuildVersion: 15.6
 #!BuildRelease: 33
@@ -35,13 +36,13 @@ RUN set -euo pipefail; \
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI Go 1.20-openssl development"
 LABEL org.opencontainers.image.description="Go 1.20-openssl development container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%%golang_version%%"
+LABEL org.opencontainers.image.version="%%golang_version%%-openssl"
 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"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.20-openssl-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.20-openssl-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-openssl-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-openssl-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:stable-1.%RELEASE%
 #!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
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable
 #!BuildVersion: 15.6.1.23.1
@@ -41,8 +42,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.23-1.%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.23-1.%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -17,9 +17,10 @@
 
 #!BuildTag: bci/golang:stable-openssl-%RELEASE%
 #!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
-#!BuildTag: bci/golang:%%golang_version%%
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable-openssl
 #!BuildVersion: 15.6
@@ -36,13 +37,13 @@ RUN set -euo pipefail; \
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE BCI Go 1.21-openssl development"
 LABEL org.opencontainers.image.description="Go 1.21-openssl development container based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%%golang_version%%"
+LABEL org.opencontainers.image.version="%%golang_version%%-openssl"
 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"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="1.21-openssl-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/golang:1.21-openssl-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%golang_version%%-openssl-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/golang:%%golang_version%%-openssl-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/kiwi:9.24.43-%RELEASE%
+#!BuildTag: bci/kiwi:9.24.43
 #!BuildTag: bci/kiwi:9-%RELEASE%
 #!BuildTag: bci/kiwi:9
 #!BuildTag: bci/kiwi:9.24
-#!BuildTag: bci/kiwi:9.24.43
 #!BuildTag: bci/kiwi:latest
 #!BuildName: bci-kiwi-9
 #!BuildVersion: 15.6.9
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="9-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:9-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="9.24.43-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:9.24.43-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -15,13 +15,15 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/nodejs:%%nodejs_version%%
 #!BuildTag: bci/nodejs:20-%RELEASE%
 #!BuildTag: bci/nodejs:20
-#!BuildTag: bci/nodejs:%%nodejs_version%%
 #!BuildTag: bci/nodejs:latest
+#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildTag: bci/node:20-%RELEASE%
 #!BuildTag: bci/node:20
-#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildTag: bci/node:latest
 #!BuildName: bci-nodejs-20
 #!BuildVersion: 15.6.20
@@ -43,8 +45,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="20-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:20-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%nodejs_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:%%nodejs_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.supportlevel.until="2026-04-30"