[bitnami/tomcat] Release tomcat-10.1.34-debian-12-r0 (#75663)

Signed-off-by: Bitnami Bot <[email protected]>
bitnami · Dec 10, 2024 · 2649adf · 2649adf
1 parent 456abda
commit 2649adf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/bitnami/tomcat/10.1/debian-12/Dockerfile b/bitnami/tomcat/10.1/debian-12/Dockerfile
@@ -9,15 +9,15 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-11-20T19:16:51Z" \
+      org.opencontainers.image.created="2024-12-10T02:54:59Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/tomcat/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.1.33-debian-12-r1" \
+      org.opencontainers.image.ref.name="10.1.34-debian-12-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tomcat" \
       org.opencontainers.image.title="tomcat" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="10.1.33"
+      org.opencontainers.image.version="10.1.34"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -30,9 +30,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libssl3 procps xmlstarlet zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "render-template-1.0.7-7-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.7-8-linux-${OS_ARCH}-debian-12" \
       "java-21.0.5-11-1-linux-${OS_ARCH}-debian-12" \
-      "tomcat-10.1.33-1-linux-${OS_ARCH}-debian-12" \
+      "tomcat-10.1.34-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -52,7 +52,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/tomcat/postunpack.sh
-ENV APP_VERSION="10.1.33" \
+ENV APP_VERSION="10.1.34" \
     BITNAMI_APP_NAME="tomcat" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:$PATH"

diff --git a/bitnami/tomcat/10.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/10.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,12 +9,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.7-7"
+        "version": "1.0.7-8"
     },
     "tomcat": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "10.1.33-1"
+        "version": "10.1.34-0"
     }
 }
diff --git a/bitnami/tomcat/10.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/tomcat/10.1/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
@@ -13,6 +13,11 @@ set -o pipefail
 . /opt/bitnami/scripts/libbitnami.sh
 . /opt/bitnami/scripts/liblog.sh
 
+if [[ "$OS_FLAVOUR" =~ photon && "$APP_VERSION" =~ ^1.8 ]]; then
+  # Option --module-path is not supported by JAVA 1.8 since modules were added in version 1.9
+  unset JAVA_TOOL_OPTIONS
+fi
+
 print_welcome_page
 
 echo ""

diff --git a/bitnami/tomcat/10.1/debian-12/tags-info.yaml b/bitnami/tomcat/10.1/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "10.1"
 - 10.1-debian-12
-- 10.1.33
+- 10.1.34
 - latest