From f9c7acf631831f21d7254e295b7b5d04cedc933a Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 9 Dec 2024 18:31:13 +0100
Subject: [PATCH] [bitnami/tomcat] Release tomcat-9.0.98-debian-12-r0 (#75580)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
---
 bitnami/tomcat/9.0/debian-12/Dockerfile              | 12 ++++++------
 .../prebuildfs/opt/bitnami/.bitnami_components.json  |  4 ++--
 .../rootfs/opt/bitnami/scripts/java/entrypoint.sh    |  5 +++++
 bitnami/tomcat/9.0/debian-12/tags-info.yaml          |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bitnami/tomcat/9.0/debian-12/Dockerfile b/bitnami/tomcat/9.0/debian-12/Dockerfile
index d71682355142..e16f1442f03f 100644
--- a/bitnami/tomcat/9.0/debian-12/Dockerfile
+++ b/bitnami/tomcat/9.0/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:23Z" \
+      org.opencontainers.image.created="2024-12-09T17:05:48Z" \
       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="9.0.97-debian-12-r2" \
+      org.opencontainers.image.ref.name="9.0.98-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="9.0.97"
+      org.opencontainers.image.version="9.0.98"
 
 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-9.0.97-2-linux-${OS_ARCH}-debian-12" \
+      "tomcat-9.0.98-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="9.0.97" \
+ENV APP_VERSION="9.0.98" \
     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/9.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/9.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index f9de0fe19f6c..4d57fe92fa73 100644
--- a/bitnami/tomcat/9.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/tomcat/9.0/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": "9.0.97-2"
+        "version": "9.0.98-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/tomcat/9.0/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/tomcat/9.0/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
index 8557631d2549..38802fc0bfe9 100755
--- a/bitnami/tomcat/9.0/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
+++ b/bitnami/tomcat/9.0/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/9.0/debian-12/tags-info.yaml b/bitnami/tomcat/9.0/debian-12/tags-info.yaml
index aad9dd4f0aa2..acb89d8a7eae 100644
--- a/bitnami/tomcat/9.0/debian-12/tags-info.yaml
+++ b/bitnami/tomcat/9.0/debian-12/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
 - "9.0"
 - 9.0-debian-12
-- 9.0.97
+- 9.0.98