Merge pull request #1853 from SUSE/for-deploy-5

🤖: Update build recipes for SP5

Author: dirkmueller

nodejs-18-image/Dockerfile

@@ -15,12 +15,14 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/nodejs:%%nodejs_version%%
 #!BuildTag: bci/nodejs:18-%RELEASE%
 #!BuildTag: bci/nodejs:18
-#!BuildTag: bci/nodejs:%%nodejs_version%%
+#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildTag: bci/node:18-%RELEASE%
 #!BuildTag: bci/node:18
-#!BuildTag: bci/node:%%nodejs_version%%
 #!BuildName: bci-nodejs-18
 #!BuildVersion: 15.5.18
 FROM registry.suse.com/bci/bci-base:15.5
@@ -40,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="18-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/nodejs:18-%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="2024-12-31"

nodejs-18-image/nodejs-18-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 14 11:26:24 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
 -------------------------------------------------------------------
 Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

openjdk-11-devel-image/Dockerfile

@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
+#!BuildTag: bci/openjdk-devel:%%java_version%%-%RELEASE%
+#!BuildTag: bci/openjdk-devel:%%java_version%%
 #!BuildTag: bci/openjdk-devel:11-%RELEASE%
 #!BuildTag: bci/openjdk-devel:11
 #!BuildName: bci-openjdk-devel-11
@@ -36,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="11-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:11-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:%%java_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

openjdk-11-devel-image/openjdk-11-devel-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 14 11:26:24 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
 -------------------------------------------------------------------
 Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

openjdk-11-image/Dockerfile

@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
+#!BuildTag: bci/openjdk:%%java_version%%-%RELEASE%
+#!BuildTag: bci/openjdk:%%java_version%%
 #!BuildTag: bci/openjdk:11-%RELEASE%
 #!BuildTag: bci/openjdk:11
 #!BuildName: bci-openjdk-11
@@ -36,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="11-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:11-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:%%java_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

openjdk-11-image/openjdk-11-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 14 11:26:24 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
 -------------------------------------------------------------------
 Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

openjdk-17-devel-image/Dockerfile

@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
+#!BuildTag: bci/openjdk-devel:%%java_version%%-%RELEASE%
+#!BuildTag: bci/openjdk-devel:%%java_version%%
 #!BuildTag: bci/openjdk-devel:17-%RELEASE%
 #!BuildTag: bci/openjdk-devel:17
 #!BuildName: bci-openjdk-devel-17
@@ -36,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="17-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:17-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/openjdk-devel:%%java_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

openjdk-17-devel-image/openjdk-17-devel-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 14 11:26:24 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
 -------------------------------------------------------------------
 Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

openjdk-17-image/Dockerfile

@@ -15,6 +15,8 @@
 
 #!UseOBSRepositories
 #!ExclusiveArch: aarch64 x86_64 ppc64le s390x
+#!BuildTag: bci/openjdk:%%java_version%%-%RELEASE%
+#!BuildTag: bci/openjdk:%%java_version%%
 #!BuildTag: bci/openjdk:17-%RELEASE%
 #!BuildTag: bci/openjdk:17
 #!BuildName: bci-openjdk-17
@@ -36,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="17-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:17-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%java_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/openjdk:%%java_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="sle-bci"

openjdk-17-image/openjdk-17-image.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 14 11:26:24 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
 -------------------------------------------------------------------
 Fri Oct 11 15:13:46 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>