From bbb54cd5afe59b75e6e390abd6905416c1d0d3d3 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 20 Jul 2023 22:28:07 +0200
Subject: [PATCH] [bitnami/discourse] Release 3.0.5-debian-11-r7 (#41689)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/discourse/3/debian-11/Dockerfile      | 14 +++----
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libvalidations.sh     | 40 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/bitnami/discourse/3/debian-11/Dockerfile b/bitnami/discourse/3/debian-11/Dockerfile
index a468f0b53f69..2b6d1b8a8257 100644
--- a/bitnami/discourse/3/debian-11/Dockerfile
+++ b/bitnami/discourse/3/debian-11/Dockerfile
@@ -5,17 +5,17 @@ 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:25Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-07-19T22:15:54Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.0.5-debian-11-r1" \
+      org.opencontainers.image.ref.name="3.0.5-debian-11-r7" \
       org.opencontainers.image.title="discourse" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.0.5"
 
-ENV HOME="/" \
-    OS_ARCH="${TARGETARCH:-amd64}" \
+ENV OS_ARCH="${TARGETARCH:-amd64}" \
     OS_FLAVOUR="debian-11" \
     OS_NAME="linux"
 
@@ -29,7 +29,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \
       "ruby-3.2.2-3-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-15.3.0-1-linux-${OS_ARCH}-debian-11" \
-      "node-18.16.1-0-linux-${OS_ARCH}-debian-11" \
+      "node-18.17.0-0-linux-${OS_ARCH}-debian-11" \
       "brotli-1.0.9-161-linux-${OS_ARCH}-debian-11" \
       "discourse-3.0.5-0-linux-${OS_ARCH}-debian-11" \
     ) && \
@@ -45,7 +45,6 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
 RUN apt-get autoremove --purge -y curl && \
     apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
-RUN chmod g+rwX /opt/bitnami
 RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2'
 
 COPY rootfs /
@@ -57,6 +56,5 @@ ENV APP_VERSION="3.0.5" \
 
 EXPOSE 3000
 
-USER root
 ENTRYPOINT [ "/opt/bitnami/scripts/discourse/entrypoint.sh" ]
 CMD [ "/opt/bitnami/scripts/discourse/run.sh" ]
diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 731f630d3f67..aedfa005dcb9 100644
--- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,7 +15,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "18.16.1-0"
+        "version": "18.17.0-0"
     },
     "postgresql-client": {
         "arch": "amd64",
diff --git a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 3c6a4109c2c5..54987abca42a 100644
--- a/bitnami/discourse/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/discourse/3/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"
 }
 
 ########################