From 1f19a0907100fc29ac6973eada80cd6bda45e183 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 21 Oct 2024 13:20:47 +0200
Subject: [PATCH] [bitnami/nginx] Release nginx-1.27.2-debian-12-r1 (#73475)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
---
 bitnami/nginx/1.27/debian-12/Dockerfile                  | 9 +++++----
 .../debian-12/rootfs/opt/bitnami/scripts/libnginx.sh     | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bitnami/nginx/1.27/debian-12/Dockerfile b/bitnami/nginx/1.27/debian-12/Dockerfile
index cf12869fd7c6..67f2c8f13681 100644
--- a/bitnami/nginx/1.27/debian-12/Dockerfile
+++ b/bitnami/nginx/1.27/debian-12/Dockerfile
@@ -3,15 +3,16 @@
 
 FROM docker.io/bitnami/minideb:bookworm
 
+ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
 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-10-02T17:47:39Z" \
+      org.opencontainers.image.created="2024-10-21T11:05:27Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/nginx/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.27.2-debian-12-r0" \
+      org.opencontainers.image.ref.name="1.27.2-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -33,8 +34,8 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
-        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
-        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
+        curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
+        curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
       fi ; \
       sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
       tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
diff --git a/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
index 30902934f122..e7f0bfe83a0e 100644
--- a/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
+++ b/bitnami/nginx/1.27/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
@@ -209,7 +209,9 @@ nginx_initialize() {
     nginx_configure "absolute_redirect" "$(is_boolean_yes "$NGINX_ENABLE_ABSOLUTE_REDIRECT" && echo "on" || echo "off" )"
     nginx_configure "port_in_redirect" "$(is_boolean_yes "$NGINX_ENABLE_PORT_IN_REDIRECT" && echo "on" || echo "off" )"
     # Stream configuration
-    if is_boolean_yes "$NGINX_ENABLE_STREAM" && is_file_writable "$NGINX_CONF_FILE"; then
+    if is_boolean_yes "$NGINX_ENABLE_STREAM" &&
+        is_file_writable "$NGINX_CONF_FILE" &&
+        ! grep -q "include  \"$NGINX_STREAM_SERVER_BLOCKS_DIR" "$NGINX_CONF_FILE"; then
         cat >> "$NGINX_CONF_FILE" <<EOF
 
 stream {