Test build for #1675

SUSE · Sep 16, 2024 · b31860f · b31860f
1 parent 892c619
commit b31860f
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 46 deletions.
diff --git a/apache-tomcat-10-java-17-image/Dockerfile b/apache-tomcat-10-java-17-image/Dockerfile
@@ -15,12 +15,12 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10-jre17
-#!BuildTag: opensuse/apache-tomcat:10-jre17-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre17
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre17-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:10-openjdk17
+#!BuildTag: opensuse/apache-tomcat:10-openjdk17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk17
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk17-%RELEASE%
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -39,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-jre17-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-jre17-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="10-openjdk17-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-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-java-17-image/README.md b/apache-tomcat-10-java-17-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-jre17
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-openjdk17
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-jre17
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-openjdk17
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:10-jre17
+      registry.opensuse.org/opensuse/apache-tomcat:10-openjdk17
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-10-java-21-image/Dockerfile b/apache-tomcat-10-java-21-image/Dockerfile
@@ -15,12 +15,12 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10-jre21
-#!BuildTag: opensuse/apache-tomcat:10-jre21-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre21
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre21-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre21
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre21-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:10-openjdk21
+#!BuildTag: opensuse/apache-tomcat:10-openjdk21-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk21
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk21-%RELEASE%
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -39,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-jre21-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-jre21-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="10-openjdk21-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-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-java-21-image/README.md b/apache-tomcat-10-java-21-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-jre21
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-openjdk21
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-jre21
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-openjdk21
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:10-jre21
+      registry.opensuse.org/opensuse/apache-tomcat:10-openjdk21
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-10-java-22-image/Dockerfile b/apache-tomcat-10-java-22-image/Dockerfile
@@ -15,12 +15,12 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10-jre22
-#!BuildTag: opensuse/apache-tomcat:10-jre22-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre22
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre22-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre22
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre22-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:10-openjdk22
+#!BuildTag: opensuse/apache-tomcat:10-openjdk22-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk22
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk22-%RELEASE%
 #!BuildTag: opensuse/apache-tomcat:latest
 
 FROM opensuse/bci/bci-micro:latest AS target
@@ -40,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="10-jre22-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-jre22-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="10-openjdk22-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-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-10-java-22-image/README.md b/apache-tomcat-10-java-22-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-jre22
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-openjdk22
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-jre22
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10-openjdk22
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:10-jre22
+      registry.opensuse.org/opensuse/apache-tomcat:10-openjdk22
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-9-java-17-image/Dockerfile b/apache-tomcat-9-java-17-image/Dockerfile
@@ -15,12 +15,12 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:9-jre17
-#!BuildTag: opensuse/apache-tomcat:9-jre17-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre17
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-jre17-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:9-openjdk17
+#!BuildTag: opensuse/apache-tomcat:9-openjdk17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk17
+#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-openjdk17-%RELEASE%
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -39,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="9-jre17-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:9-jre17-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="9-openjdk17-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:9-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-9-java-17-image/README.md b/apache-tomcat-9-java-17-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9-jre17
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9-jre17
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:9-jre17
+      registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/spack-image/Dockerfile b/spack-image/Dockerfile
@@ -30,7 +30,7 @@ RUN set -euo pipefail; zypper -n in spack bison cmake-full flex libtool makeinfo
 LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Spack development"
 LABEL org.opencontainers.image.description="Spack development container for building containerized HPC solution stacks, based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="0.22"
+LABEL org.opencontainers.image.version="0.22.1"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"

diff --git a/spack-image/README.md b/spack-image/README.md
@@ -1,4 +1,4 @@
-# Spack 0.22 container image
+# Spack 0.22.1 container image
 ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
 
 ## Description