From 529cb5ba00cb51074592d52bfed34498c9a6b161 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 23 Oct 2024 20:01:11 +0200
Subject: [PATCH] [bitnami/wordpress-nginx] Release
 wordpress-nginx-6.6.2-debian-12-r11 (#73557)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
---
 bitnami/wordpress-nginx/6/debian-12/Dockerfile            | 8 ++++----
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 4 ++--
 .../6/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh    | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bitnami/wordpress-nginx/6/debian-12/Dockerfile b/bitnami/wordpress-nginx/6/debian-12/Dockerfile
index f0922d2e4ba20..44f9e9ef1ae01 100644
--- a/bitnami/wordpress-nginx/6/debian-12/Dockerfile
+++ b/bitnami/wordpress-nginx/6/debian-12/Dockerfile
@@ -8,11 +8,11 @@ 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-17T16:17:29Z" \
+      org.opencontainers.image.created="2024-10-23T17:23:59Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/wordpress-nginx/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.6.2-debian-12-r10" \
+      org.opencontainers.image.ref.name="6.6.2-debian-12-r11" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wordpress-nginx" \
       org.opencontainers.image.title="wordpress-nginx" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -30,10 +30,10 @@ RUN install_packages acl ca-certificates curl gettext less libaudit1 libbrotli1
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "render-template-1.0.7-5-linux-${OS_ARCH}-debian-12" \
-      "php-8.2.24-3-linux-${OS_ARCH}-debian-12" \
+      "php-8.2.25-0-linux-${OS_ARCH}-debian-12" \
       "nginx-1.27.2-0-linux-${OS_ARCH}-debian-12" \
       "mysql-client-11.4.3-0-linux-${OS_ARCH}-debian-12" \
-      "wordpress-nginx-6.6.2-10-linux-${OS_ARCH}-debian-12" \
+      "wordpress-nginx-6.6.2-11-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index eac8515c700c2..d053cbd60e40a 100644
--- a/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/wordpress-nginx/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,7 +15,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.24-3"
+        "version": "8.2.25-0"
     },
     "render-template": {
         "arch": "amd64",
@@ -27,6 +27,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "6.6.2-10"
+        "version": "6.6.2-11"
     }
 }
\ No newline at end of file
diff --git a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
index 30902934f1224..e7f0bfe83a0e1 100644
--- a/bitnami/wordpress-nginx/6/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
+++ b/bitnami/wordpress-nginx/6/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 {