From 913a6fdc47c4bc801823ef42000b3d85f97a8e40 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 19 Jul 2023 23:18:17 +0200
Subject: [PATCH] [bitnami/java] Release 1.8.382-6-debian-11-r0 (#41430)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/java/1.8/debian-11/Dockerfile         | 13 +++---
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libvalidations.sh     | 40 ++++++++++++++++++-
 bitnami/java/1.8/debian-11/tags-info.yaml     |  2 +-
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/bitnami/java/1.8/debian-11/Dockerfile b/bitnami/java/1.8/debian-11/Dockerfile
index df4d37c40f49..9109202a8255 100644
--- a/bitnami/java/1.8/debian-11/Dockerfile
+++ b/bitnami/java/1.8/debian-11/Dockerfile
@@ -6,14 +6,15 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
-LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-15T06:25:18Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-07-19T20:14:16Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.8.372-7-debian-11-r21" \
+      org.opencontainers.image.ref.name="1.8.382-6-debian-11-r0" \
       org.opencontainers.image.title="java" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="1.8.372-7"
+      org.opencontainers.image.version="1.8.382-6"
 
 ENV OS_ARCH="${TARGETARCH:-amd64}" \
     OS_FLAVOUR="debian-11" \
@@ -25,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libfontconfig libgcc-s1 libsqlite3-dev libssl-dev locales procps wget
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-1.8.372-7-1-linux-${OS_ARCH}-debian-11" \
+      "java-1.8.382-6-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -50,7 +51,7 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS    90/' /etc/login.defs && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
-ENV APP_VERSION="1.8.372-7" \
+ENV APP_VERSION="1.8.382-6" \
     BITNAMI_APP_NAME="java" \
     JAVA_HOME="/opt/bitnami/java" \
     LANG="en_US.UTF-8" \
diff --git a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 9c539cbb337e..8ae3c9ab5629 100644
--- a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.8.372-7-1"
+        "version": "1.8.382-6-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 3c6a4109c2c5..54987abca42a 100644
--- a/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/java/1.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -187,6 +187,25 @@ validate_port() {
     fi
 }
 
+########################
+# Validate if the provided argument is a valid IPv6 address
+# Arguments:
+#   $1 - IP to validate
+# Returns:
+#   Boolean
+#########################
+validate_ipv6() {
+    local ip="${1:?ip is missing}"
+    local stat=1
+    local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$'
+    local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$'
+
+    if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
+        stat=0
+    fi
+    return "$stat"
+}
+
 ########################
 # Validate if the provided argument is a valid IPv4 address
 # Arguments:
@@ -204,7 +223,26 @@ validate_ipv4() {
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?
     fi
-    return $stat
+    return "$stat"
+}
+
+########################
+# Validate if the provided argument is a valid IPv4 or IPv6 address
+# Arguments:
+#   $1 - IP to validate
+# Returns:
+#   Boolean
+#########################
+validate_ip() {
+    local ip="${1:?ip is missing}"
+    local stat=1
+
+    if validate_ipv4 "$ip"; then
+        stat=0
+    else
+        stat=$(validate_ipv6 "$ip")
+    fi
+    return "$stat"
 }
 
 ########################
diff --git a/bitnami/java/1.8/debian-11/tags-info.yaml b/bitnami/java/1.8/debian-11/tags-info.yaml
index 9cd090c62b53..2f5c5a65abf5 100644
--- a/bitnami/java/1.8/debian-11/tags-info.yaml
+++ b/bitnami/java/1.8/debian-11/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
 - "1.8"
 - 1.8-debian-11
-- 1.8.372-7
+- 1.8.382-6