Accepting request 1194073 from devel:BCI:Tumbleweed

🤖: sync package with devel:BCI:Tumbleweed from OBS

OBS-URL: https://build.opensuse.org/request/show/1194073
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-tomcat-10-java-17-image?expand=0&rev=8

Dockerfile

@@ -21,28 +21,31 @@
 #!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17
 #!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-jre17-%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-17-openjdk java-17-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-jre17"
+LABEL org.opencontainers.image.description="Apache Tomcat is a free and open-source implementation of the Jakarta Servlet, Jakarta Expression Language, and WebSocket technologies, based on the openSUSE Tumbleweed Base Container Image."
+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"
 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.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"
 # endlabelprefix
-LABEL org.opencontainers.image.revision="%DISTURL%"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-java-17-image/README.md"
 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-17-openjdk java-17-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

@@ -1,4 +1,4 @@
-# Tomcat 10-jre17 container image
+# Tomcat 10 container image
 ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
 
 ## Description
@@ -14,9 +14,8 @@ that comes with SUSE Linux Enterprise Server. The difference is that logging is
 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 @@ The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`
 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

apache-tomcat-10-java-17-image.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Aug 14 16:03:10 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- extend description
+
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
+Thu Aug  8 19:28:10 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- add oci.image.ref.name
+
+-------------------------------------------------------------------
+Thu Aug  8 16:43:43 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- remove oci reference annotation again
+
 -------------------------------------------------------------------
 Mon Aug  5 11:38:13 UTC 2024 - Dirk Mueller <dmueller@suse.com>