From 5cd559d095dc44ada7f1ddd45ec24553775e0fdb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 6 Jun 2024 14:58:23 +0200
Subject: [PATCH] [bitnami/solr] Release 8.11.3-debian-12-r9 (#67659)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/solr/8/debian-12/Dockerfile                       | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 2 +-
 .../8/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh  | 8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bitnami/solr/8/debian-12/Dockerfile b/bitnami/solr/8/debian-12/Dockerfile
index e0c50306a94a..46ea5766bfad 100644
--- a/bitnami/solr/8/debian-12/Dockerfile
+++ b/bitnami/solr/8/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-13T23:56:56Z" \
+      org.opencontainers.image.created="2024-06-06T11:58:40Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/solr/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.11.3-debian-12-r8" \
+      org.opencontainers.image.ref.name="8.11.3-debian-12-r9" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/solr" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -29,7 +29,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl lsof netcat-openbsd procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "java-17.0.11-10-1-linux-${OS_ARCH}-debian-12" \
+      "java-17.0.11-12-0-linux-${OS_ARCH}-debian-12" \
       "solr-8.11.3-4-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 4d9d87ec3a02..1cf004ffcce1 100644
--- a/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/solr/8/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": "17.0.11-12-0"
     },
     "solr": {
         "arch": "amd64",
diff --git a/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
index 90652245c2a7..004e426fba17 100644
--- a/bitnami/solr/8/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/solr/8/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
 }
 
 ########################