From 31fe4f2111bb378daaa619d6e191dd41c38c9be8 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 27 May 2024 12:47:18 +0200
Subject: [PATCH] [bitnami/tomcat] Release 10.1.24-debian-12-r1 (#67271)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/tomcat/10.1/debian-12/Dockerfile                  | 8 ++++----
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 4 ++--
 .../debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh    | 8 +++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bitnami/tomcat/10.1/debian-12/Dockerfile b/bitnami/tomcat/10.1/debian-12/Dockerfile
index 8fa4f084a84e..2b125fc58387 100644
--- a/bitnami/tomcat/10.1/debian-12/Dockerfile
+++ b/bitnami/tomcat/10.1/debian-12/Dockerfile
@@ -8,11 +8,11 @@ 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-05-14T05:41:37Z" \
+      org.opencontainers.image.created="2024-05-27T10:21:16Z" \
       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.24-debian-12-r0" \
+      org.opencontainers.image.ref.name="10.1.24-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tomcat" \
       org.opencontainers.image.title="tomcat" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -30,8 +30,8 @@ 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.6-13-linux-${OS_ARCH}-debian-12" \
-      "java-17.0.11-10-1-linux-${OS_ARCH}-debian-12" \
-      "tomcat-10.1.24-0-linux-${OS_ARCH}-debian-12" \
+      "java-21.0.3-12-0-linux-${OS_ARCH}-debian-12" \
+      "tomcat-10.1.24-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
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
index 267b42698c85..a12fbc81c27d 100644
--- 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
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "17.0.11-10-1"
+        "version": "21.0.3-12-0"
     },
     "render-template": {
         "arch": "amd64",
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "10.1.24-0"
+        "version": "10.1.24-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/tomcat/10.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/tomcat/10.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
index 90652245c2a7..004e426fba17 100644
--- a/bitnami/tomcat/10.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/tomcat/10.1/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -8,6 +8,7 @@
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/libvalidations.sh
 
 # Functions
 
@@ -68,7 +69,12 @@ get_machine_ip() {
         error "Could not find any IP address associated to hostname ${hostname}"
         exit 1
     fi
-    echo "${ip_addresses[0]}"
+    # Check if the first IP address is IPv6 to add brackets
+    if validate_ipv6 "${ip_addresses[0]}" ; then
+        echo "[${ip_addresses[0]}]"
+    else
+        echo "${ip_addresses[0]}"
+    fi
 }
 
 ########################