Test build for #1669

SUSE · Sep 19, 2024 · 762f98e · 762f98e
1 parent 1beb260
commit 762f98e
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 53 deletions.
diff --git a/apache-tomcat-10-java-17-image/Dockerfile b/apache-tomcat-10-java-17-image/Dockerfile
@@ -15,12 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10-openjdk17
-#!BuildTag: opensuse/apache-tomcat:10-openjdk17-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:10.1-openjdk17
+#!BuildTag: opensuse/apache-tomcat:10.1-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 registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -39,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="10-openjdk17-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-openjdk17-%RELEASE%"
+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.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-openjdk17
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-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-openjdk17
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-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-openjdk17
+      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk17
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-10-java-17-image/_service b/apache-tomcat-10-java-17-image/_service
@@ -6,10 +6,4 @@
     <param name="regex">%%tomcat_version%%</param>
     <param name="package">tomcat10</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%tomcat_minor%%</param>
-    <param name="package">tomcat10</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>
diff --git a/apache-tomcat-10-java-21-image/Dockerfile b/apache-tomcat-10-java-21-image/Dockerfile
@@ -15,12 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10-openjdk21
-#!BuildTag: opensuse/apache-tomcat:10-openjdk21-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:10.1-openjdk21
+#!BuildTag: opensuse/apache-tomcat:10.1-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 registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -39,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="10-openjdk21-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-openjdk21-%RELEASE%"
+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.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-openjdk21
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-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-openjdk21
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-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-openjdk21
+      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk21
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-10-java-21-image/_service b/apache-tomcat-10-java-21-image/_service
@@ -6,10 +6,4 @@
     <param name="regex">%%tomcat_version%%</param>
     <param name="package">tomcat10</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%tomcat_minor%%</param>
-    <param name="package">tomcat10</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>
diff --git a/apache-tomcat-10-java-22-image/Dockerfile b/apache-tomcat-10-java-22-image/Dockerfile
@@ -15,12 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10-openjdk22
-#!BuildTag: opensuse/apache-tomcat:10-openjdk22-%RELEASE%
+#!BuildTag: opensuse/apache-tomcat:10.1-openjdk22
+#!BuildTag: opensuse/apache-tomcat:10.1-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 registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
@@ -40,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="10-openjdk22-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-openjdk22-%RELEASE%"
+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.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-openjdk22
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-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-openjdk22
+      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-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-openjdk22
+      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-10-java-22-image/_service b/apache-tomcat-10-java-22-image/_service
@@ -6,10 +6,4 @@
     <param name="regex">%%tomcat_version%%</param>
     <param name="package">tomcat10</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%tomcat_minor%%</param>
-    <param name="package">tomcat10</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>
diff --git a/apache-tomcat-9-java-17-image/Dockerfile b/apache-tomcat-9-java-17-image/Dockerfile
@@ -19,8 +19,6 @@
 #!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 registry.opensuse.org/opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder

diff --git a/apache-tomcat-9-java-17-image/_service b/apache-tomcat-9-java-17-image/_service
@@ -6,10 +6,4 @@
     <param name="regex">%%tomcat_version%%</param>
     <param name="package">tomcat</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%tomcat_minor%%</param>
-    <param name="package">tomcat</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>