From 2152efd2c593c0d81bd397b2a5d26fd609aaf665 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 20 Jul 2023 07:48:37 +0200
Subject: [PATCH] [bitnami/openresty] Release 1.21.4-2-debian-11-r0 (#41437)

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

diff --git a/bitnami/openresty/1.21/debian-11/Dockerfile b/bitnami/openresty/1.21/debian-11/Dockerfile
index 343655afcb24..edd14730fce0 100644
--- a/bitnami/openresty/1.21/debian-11/Dockerfile
+++ b/bitnami/openresty/1.21/debian-11/Dockerfile
@@ -5,14 +5,15 @@ FROM docker.io/bitnami/minideb:bullseye
 
 ARG TARGETARCH
 
-LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-15T07:01:44Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-07-20T04:41:31Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.21.4-1-debian-11-r137" \
+      org.opencontainers.image.ref.name="1.21.4-2-debian-11-r0" \
       org.opencontainers.image.title="openresty" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="1.21.4-1"
+      org.opencontainers.image.version="1.21.4-2"
 
 ENV HOME="/home/openresty" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -25,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbrotli1 libbsd0 libcrypt1 libdeflate0 libexpat1 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libgd3 libgeoip1 libgpg-error0 libicu67 libjbig0 libjpeg62-turbo liblzma5 libmd0 libpcre3 libpng16-16 libssl1.1 libstdc++6 libtiff5 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxml2 libxpm4 libxslt1.1 libzstd1 perl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "openresty-1.21.4-1-163-linux-${OS_ARCH}-debian-11" \
+      "openresty-1.21.4-2-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -42,7 +43,7 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/openresty/postunpack.sh
-ENV APP_VERSION="1.21.4-1" \
+ENV APP_VERSION="1.21.4-2" \
     BITNAMI_APP_NAME="openresty" \
     PATH="/opt/bitnami/openresty/bin:/opt/bitnami/openresty/luajit/bin:$PATH"
 
diff --git a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 4b5acce1b528..0707287d7963 100644
--- a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.21.4-1-163"
+        "version": "1.21.4-2-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 3c6a4109c2c5..54987abca42a 100644
--- a/bitnami/openresty/1.21/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/openresty/1.21/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/openresty/1.21/debian-11/tags-info.yaml b/bitnami/openresty/1.21/debian-11/tags-info.yaml
index 1639e5c0756e..91d33112af94 100644
--- a/bitnami/openresty/1.21/debian-11/tags-info.yaml
+++ b/bitnami/openresty/1.21/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "1.21"
 - 1.21-debian-11
-- 1.21.4-1
+- 1.21.4-2
 - latest