From 95cbffba56b64f555722c5e58fdce97bff41b905 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 18 Jul 2023 23:34:27 +0200
Subject: [PATCH] [bitnami/zookeeper] Release 3.8.2-debian-11-r0 (#41401)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/zookeeper/3.8/debian-11/Dockerfile    | 10 ++---
 .../3.8/debian-11/docker-compose.yml          |  2 +-
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libvalidations.sh     | 40 ++++++++++++++++++-
 .../zookeeper/3.8/debian-11/tags-info.yaml    |  2 +-
 bitnami/zookeeper/docker-compose.yml          |  2 +-
 6 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/bitnami/zookeeper/3.8/debian-11/Dockerfile b/bitnami/zookeeper/3.8/debian-11/Dockerfile
index a4debd8620f5..179925bd7f2f 100644
--- a/bitnami/zookeeper/3.8/debian-11/Dockerfile
+++ b/bitnami/zookeeper/3.8/debian-11/Dockerfile
@@ -7,13 +7,13 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-18T10:56:25Z" \
+      org.opencontainers.image.created="2023-07-18T20:22:37Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.8.1-debian-11-r147" \
+      org.opencontainers.image.ref.name="3.8.2-debian-11-r0" \
       org.opencontainers.image.title="zookeeper" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="3.8.1"
+      org.opencontainers.image.version="3.8.2"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -29,7 +29,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \
       "java-11.0.19-7-2-linux-${OS_ARCH}-debian-11" \
-      "zookeeper-3.8.1-8-linux-${OS_ARCH}-debian-11" \
+      "zookeeper-3.8.2-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -48,7 +48,7 @@ RUN ln -s /opt/bitnami/scripts/zookeeper/run.sh /run.sh
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/zookeeper/postunpack.sh
-ENV APP_VERSION="3.8.1" \
+ENV APP_VERSION="3.8.2" \
     BITNAMI_APP_NAME="zookeeper"
 
 EXPOSE 2181 2888 3888 8080
diff --git a/bitnami/zookeeper/3.8/debian-11/docker-compose.yml b/bitnami/zookeeper/3.8/debian-11/docker-compose.yml
index bad7fee6c7fc..f106fb2c28d1 100644
--- a/bitnami/zookeeper/3.8/debian-11/docker-compose.yml
+++ b/bitnami/zookeeper/3.8/debian-11/docker-compose.yml
@@ -5,7 +5,7 @@ version: '2'
 
 services:
   zookeeper:
-    image: zookeeper
+    image: docker.io/bitnami/zookeeper:3.8
     ports:
       - '2181:2181'
     volumes:
diff --git a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 36d047919e14..a32419e8b4c4 100644
--- a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.8.1-8"
+        "version": "3.8.2-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 3c6a4109c2c5..54987abca42a 100644
--- a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/zookeeper/3.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/zookeeper/3.8/debian-11/tags-info.yaml b/bitnami/zookeeper/3.8/debian-11/tags-info.yaml
index fbe24fe56539..1024206b1406 100644
--- a/bitnami/zookeeper/3.8/debian-11/tags-info.yaml
+++ b/bitnami/zookeeper/3.8/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "3.8"
 - 3.8-debian-11
-- 3.8.1
+- 3.8.2
 - latest
diff --git a/bitnami/zookeeper/docker-compose.yml b/bitnami/zookeeper/docker-compose.yml
index bad7fee6c7fc..f106fb2c28d1 100644
--- a/bitnami/zookeeper/docker-compose.yml
+++ b/bitnami/zookeeper/docker-compose.yml
@@ -5,7 +5,7 @@ version: '2'
 
 services:
   zookeeper:
-    image: zookeeper
+    image: docker.io/bitnami/zookeeper:3.8
     ports:
       - '2181:2181'
     volumes: