From 9a687a2fe1e53f9c902f7993ecc0a0aa54beced4dae033761c4444002393f5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 23 Oct 2024 10:24:08 +0000 Subject: [PATCH 1/2] [info=0363549cea07b5d278cda49154454396] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/apache-tomcat-10-image?expand=0&rev=13 --- Dockerfile.openjdk17 | 2 +- Dockerfile.openjdk21 | 2 +- Dockerfile.openjdk22 | 2 +- apache-tomcat-10-image.changes | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile.openjdk17 b/Dockerfile.openjdk17 index bd08fc3..77232e8 100644 --- a/Dockerfile.openjdk17 +++ b/Dockerfile.openjdk17 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 which curl sed java-17-openjdk java-17-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-17-openjdk java-17-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} diff --git a/Dockerfile.openjdk21 b/Dockerfile.openjdk21 index e8f77b3..90ba7c8 100644 --- a/Dockerfile.openjdk21 +++ b/Dockerfile.openjdk21 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 which curl sed java-21-openjdk java-21-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-21-openjdk java-21-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} diff --git a/Dockerfile.openjdk22 b/Dockerfile.openjdk22 index d8d1088..7cc4068 100644 --- a/Dockerfile.openjdk22 +++ b/Dockerfile.openjdk22 @@ -26,7 +26,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 which curl sed java-22-openjdk java-22-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-22-openjdk java-22-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} diff --git a/apache-tomcat-10-image.changes b/apache-tomcat-10-image.changes index e824c45..7d6df40 100644 --- a/apache-tomcat-10-image.changes +++ b/apache-tomcat-10-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 23 10:21:39 UTC 2024 - SUSE Update Bot + +- revert temporary explicit install of which + ------------------------------------------------------------------- Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot From eef5fc8699cbfe3376650569ce08f3387afcbd36121d7a030d91552d958af03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 23 Oct 2024 10:56:02 +0000 Subject: [PATCH 2/2] [info=1d67267f78800fa1e58d22e2f44851b8] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/apache-tomcat-10-image?expand=0&rev=14 --- Dockerfile.openjdk22 => Dockerfile.openjdk23 | 17 ++++++++--------- README.openjdk22.md => README.openjdk23.md | 6 +++--- _multibuild | 2 +- _service | 2 +- apache-tomcat-10-image.changes | 5 +++++ 5 files changed, 18 insertions(+), 14 deletions(-) rename Dockerfile.openjdk22 => Dockerfile.openjdk23 (88%) rename README.openjdk22.md => README.openjdk23.md (98%) diff --git a/Dockerfile.openjdk22 b/Dockerfile.openjdk23 similarity index 88% rename from Dockerfile.openjdk22 rename to Dockerfile.openjdk23 index 7cc4068..e967587 100644 --- a/Dockerfile.openjdk22 +++ b/Dockerfile.openjdk23 @@ -15,18 +15,17 @@ #!UseOBSRepositories -#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE% -#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22 -#!BuildTag: opensuse/apache-tomcat:10.1-openjdk22-%RELEASE% -#!BuildTag: opensuse/apache-tomcat:10.1-openjdk22 -#!BuildTag: opensuse/apache-tomcat:latest +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk23-%RELEASE% +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk23 +#!BuildTag: opensuse/apache-tomcat:10.1-openjdk23-%RELEASE% +#!BuildTag: opensuse/apache-tomcat:10.1-openjdk23 FROM opensuse/bci/bci-micro:latest AS target FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-22-openjdk java-22-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-23-openjdk java-23-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} @@ -42,13 +41,13 @@ 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="%%tomcat_version%%-openjdk22-%RELEASE%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE%" +LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk23-%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk23-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" LABEL org.opensuse.release-stage="released" # endlabelprefix -LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk22.md" +LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.openjdk23.md" LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png" ENV TOMCAT_MAJOR="10" ENV TOMCAT_VERSION="%%tomcat_version%%" diff --git a/README.openjdk22.md b/README.openjdk23.md similarity index 98% rename from README.openjdk22.md rename to README.openjdk23.md index 2e977a8..b8f713e 100644 --- a/README.openjdk22.md +++ b/README.openjdk23.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.1-openjdk22 +$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk23 ``` 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.1-openjdk22 + -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk23 ``` @@ -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.1-openjdk22 + registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk23 ``` The image ships with `CATALINA_HOME` set to `/usr/share/tomcat` diff --git a/_multibuild b/_multibuild index 5766c96..93c656c 100644 --- a/_multibuild +++ b/_multibuild @@ -1,5 +1,5 @@ openjdk17 openjdk21 - openjdk22 + openjdk23 \ No newline at end of file diff --git a/_service b/_service index 246b494..e10da9d 100644 --- a/_service +++ b/_service @@ -12,7 +12,7 @@ tomcat10 - Dockerfile.openjdk22 + Dockerfile.openjdk23 %%tomcat_version%% tomcat10 diff --git a/apache-tomcat-10-image.changes b/apache-tomcat-10-image.changes index 7d6df40..c905eee 100644 --- a/apache-tomcat-10-image.changes +++ b/apache-tomcat-10-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 23 10:52:04 UTC 2024 - SUSE Update Bot + +- build tomcat for openjdk23 rather than 22 on TW + ------------------------------------------------------------------- Wed Oct 23 10:21:39 UTC 2024 - SUSE Update Bot