Test build for #1830

SUSE · Oct 10, 2024 · 7ac3b59 · 7ac3b59
1 parent 97562c4
commit 7ac3b59
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/nodejs-18-image/Dockerfile b/nodejs-18-image/Dockerfile
@@ -15,11 +15,11 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/nodejs:18
-#!BuildTag: bci/nodejs:18-%RELEASE%
 #!BuildTag: bci/nodejs:%%nodejs_version%%
-#!BuildTag: bci/node:18
-#!BuildTag: bci/node:18-%RELEASE%
+#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
+#!BuildTag: bci/nodejs:%%nodejs_version%%
+#!BuildTag: bci/node:%%nodejs_version%%
+#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
 #!BuildTag: bci/node:%%nodejs_version%%
 #!BuildName: bci-nodejs-18
 #!BuildVersion: 15.5.18
@@ -40,8 +40,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"

diff --git a/openjdk-11-devel-image/README.md b/openjdk-11-devel-image/README.md
@@ -32,7 +32,7 @@ COPY . ./
 RUN javac Hello.java
 
 # Bundle the application into OpenJDK runtime image
-FROM registry.suse.com/bci/openjdk:11
+FROM registry.suse.com/bci/openjdk:None
 
 WORKDIR /app
 

diff --git a/openjdk-11-image/README.md b/openjdk-11-image/README.md
@@ -34,7 +34,7 @@ To compile and deploy an application, copy the sources and build the application
 
 ```Dockerfile
 # Build the application using the OpenJDK development image
-FROM registry.suse.com/bci/openjdk-devel:11  as build
+FROM registry.suse.com/bci/openjdk-devel:None  as build
 
 WORKDIR /app
 

diff --git a/openjdk-17-devel-image/README.md b/openjdk-17-devel-image/README.md
@@ -32,7 +32,7 @@ COPY . ./
 RUN javac Hello.java
 
 # Bundle the application into OpenJDK runtime image
-FROM registry.suse.com/bci/openjdk:17
+FROM registry.suse.com/bci/openjdk:None
 
 WORKDIR /app
 

diff --git a/openjdk-17-image/README.md b/openjdk-17-image/README.md
@@ -34,7 +34,7 @@ To compile and deploy an application, copy the sources and build the application
 
 ```Dockerfile
 # Build the application using the OpenJDK development image
-FROM registry.suse.com/bci/openjdk-devel:17  as build
+FROM registry.suse.com/bci/openjdk-devel:None  as build
 
 WORKDIR /app
 

diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: suse/postgres:15
-#!BuildTag: suse/postgres:15-%RELEASE%
+#!BuildTag: suse/postgres:%%pg_patch_version%%
+#!BuildTag: suse/postgres:%%pg_patch_version%%-%RELEASE%
 #!BuildTag: suse/postgres:%%pg_minor_version%%
 #!BuildTag: suse/postgres:%%pg_patch_version%%
 #!BuildName: suse-postgres-15
@@ -38,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="15-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/suse/postgres:15-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="%%pg_patch_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/suse/postgres:%%pg_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="acc"
 LABEL com.suse.eula="sle-eula"