From 72561c076545cfb21ddc5b66b8e74b4cee5cee49 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 26 Oct 2022 21:07:48 +0200
Subject: [PATCH] [bitnami/wordpress-intel] Release 6.0.3-debian-11-r3 (#11507)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/wordpress-intel/6/debian-11/Dockerfile            | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 8 ++++----
 .../6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitnami/wordpress-intel/6/debian-11/Dockerfile b/bitnami/wordpress-intel/6/debian-11/Dockerfile
index aafc82e54ddb..1e110525db7c 100644
--- a/bitnami/wordpress-intel/6/debian-11/Dockerfile
+++ b/bitnami/wordpress-intel/6/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="6.0.3-debian-11-r2" \
+      org.opencontainers.image.ref.name="6.0.3-debian-11-r3" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wordpress-intel" \
       org.opencontainers.image.title="wordpress-intel" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -23,11 +23,11 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \
       "qatengine-0.6.16-0-linux-${OS_ARCH}-debian-11" \
-      "php-8.0.24-4-linux-${OS_ARCH}-debian-11" \
+      "php-8.0.25-1-linux-${OS_ARCH}-debian-11" \
       "wp-cli-2.7.1-0-linux-${OS_ARCH}-debian-11" \
       "nginx-intel-0.4.8-2-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.6.10-1-linux-${OS_ARCH}-debian-11" \
-      "wordpress-6.0.3-0-linux-${OS_ARCH}-debian-11" \
+      "wordpress-6.0.3-1-linux-${OS_ARCH}-debian-11" \
       "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index ff9b09e9b1c1..9b609dde6058 100644
--- a/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/wordpress-intel/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -22,10 +22,10 @@
     },
     "php": {
         "arch": "amd64",
-        "digest": "706be28d9740ee4274589414f3cd612e0b9a7a070ebeb3256a55f3846965c5ec",
+        "digest": "104bdf492c9547ed70b6566469746ff300a817eb8111420f9a6d5ad34c89e044",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.0.24-4"
+        "version": "8.0.25-1"
     },
     "qatengine": {
         "arch": "amd64",
@@ -43,10 +43,10 @@
     },
     "wordpress": {
         "arch": "amd64",
-        "digest": "7385cd5afc72f6c2388ded8bbc1d4fc73b3fb8f703efe29ff64ffa61ef086e93",
+        "digest": "d9d3e0c50f99b9a47dabb2c1f5a25ecea03af0e4fd8a5b224192b4f1148de191",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "6.0.3-0"
+        "version": "6.0.3-1"
     },
     "wp-cli": {
         "arch": "amd64",
diff --git a/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
index 3926fb4b7660..5886efec8713 100755
--- a/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
+++ b/bitnami/wordpress-intel/6/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
@@ -31,7 +31,7 @@ nginx_custom_init_scripts
 ! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)"
 
 # Configure HTTPS port number
-if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]]; then
+if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_dir_empty "${NGINX_SERVER_BLOCKS_DIR}"; then
     cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
 fi