Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apache-tomcat-10-java-21-image for openSUSE:Factory checked in at 2024-08-15 09:57:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-tomcat-10-java-21-image (Old) and /work/SRC/openSUSE:Factory/.apache-tomcat-10-java-21-image.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-tomcat-10-java-21-image" Thu Aug 15 09:57:49 2024 rev:7 rq:1193906 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/apache-tomcat-10-java-21-image/apache-tomcat-10-java-21-image.changes 2024-08-10 19:13:02.402837239 +0200 +++ /work/SRC/openSUSE:Factory/.apache-tomcat-10-java-21-image.new.7232/apache-tomcat-10-java-21-image.changes 2024-08-15 09:58:01.538218759 +0200 @@ -1,0 +2,10 @@ +Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <dmueller@suse.com> + +- install packages first + +------------------------------------------------------------------- +Wed Aug 14 11:58:49 UTC 2024 - Dirk Mueller <dmueller@suse.com> + +- Fix oci.version to be the fully qualified tomcat version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.SbcPvA/_old 2024-08-15 09:58:01.966236672 +0200 +++ /var/tmp/diff_new_pack.SbcPvA/_new 2024-08-15 09:58:01.974237007 +0200 @@ -21,14 +21,19 @@ #!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre21 #!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre21-%RELEASE% -FROM opensuse/tumbleweed:latest +FROM opensuse/bci/bci-micro:latest AS target +FROM opensuse/tumbleweed:latest AS builder +COPY --from=target / /target +RUN set -euo pipefail; zypper --installroot /target --gpg-auto-import-keys -n in --no-recommends tomcat10 curl sed java-21-openjdk java-21-openjdk-headless; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +FROM target +COPY --from=builder /target / # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=org.opensuse.application.apache-tomcat LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed Apache Tomcat" LABEL org.opencontainers.image.description="Apache Tomcat container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="10-jre21" +LABEL org.opencontainers.image.version="%%tomcat_version%%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" @@ -41,8 +46,6 @@ # endlabelprefix LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/a..." LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png" - -RUN set -euo pipefail; zypper -n in --no-recommends tomcat10 java-21-openjdk java-21-openjdk-headless; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} ENV TOMCAT_MAJOR="10" ENV TOMCAT_VERSION="%%tomcat_version%%" ENV CATALINA_HOME="/usr/share/tomcat" ++++++ README.md ++++++ --- /var/tmp/diff_new_pack.SbcPvA/_old 2024-08-15 09:58:02.002238178 +0200 +++ /var/tmp/diff_new_pack.SbcPvA/_new 2024-08-15 09:58:02.006238345 +0200 @@ -1,4 +1,4 @@ -# Tomcat 10-jre21 container image +# Tomcat 10 container image  ## Description @@ -14,9 +14,8 @@ sent to stdout, meaning that the `podman logs tomcat` command displays Tomcat logs. -For security reasons, the image runs as the **tomcat** user. This means that -additional packages cannot be installed via `zypper`, unless the user becomes -`root`. +For security reasons, the image runs as the **tomcat** user and is installed +on a micro base container without a package manager. To deploy an application, copy the `.war` file into `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting @@ -62,14 +61,6 @@ and `CATALINA_BASE` set to `/usr/share/tomcat`. -## Samples - -By default, the sample applications shipped with Tomcat are not installed in -the container image. Add them by installing one of the following -packages: -- tomcat10-webapps -- tomcat10-admin-webapps - ## Upgrading from Tomcat 9 Tomcat 9 implements Java EE 8, and Tomcat 10