From 194a2b901c6cb7bea0f9ccaf01f04657290e24d4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 20 Jan 2023 15:13:37 +0100
Subject: [PATCH] [bitnami/drupal-nginx] Release 10.0.2-debian-11-r1 (#21213)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/drupal-nginx/10/debian-11/Dockerfile                 | 4 ++--
 .../prebuildfs/opt/bitnami/.bitnami_components.json          | 4 ++--
 .../debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh   | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/bitnami/drupal-nginx/10/debian-11/Dockerfile b/bitnami/drupal-nginx/10/debian-11/Dockerfile
index c933decd9bce..328025790648 100644
--- a/bitnami/drupal-nginx/10/debian-11/Dockerfile
+++ b/bitnami/drupal-nginx/10/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.0.2-debian-11-r0" \
+      org.opencontainers.image.ref.name="10.0.2-debian-11-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal-nginx" \
       org.opencontainers.image.title="drupal-nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "mysql-client-10.6.11-2-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-0-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \
-      "drupal-10.0.2-0-linux-${OS_ARCH}-debian-11" \
+      "drupal-10.0.2-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 3f188ab2289e..6e56eb00e20a 100644
--- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,10 +1,10 @@
 {
     "drupal": {
         "arch": "amd64",
-        "digest": "4dc7d35072d67779c7ed46da23cf9145a9e4b1443fb2178dc03d9e609d2e5849",
+        "digest": "5995f6baa1ba06ffea2933743aed9c89d88951ef166a81a87e7d4f5ed32bb3a8",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "10.0.2-0"
+        "version": "10.0.2-1"
     },
     "gosu": {
         "arch": "amd64",
diff --git a/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh b/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh
index 3238c296a119..bc028e46e22f 100755
--- a/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh
+++ b/bitnami/drupal-nginx/10/debian-11/rootfs/opt/bitnami/scripts/php/postunpack.sh
@@ -26,9 +26,6 @@ php_conf_set "listen" "$PHP_FPM_DEFAULT_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm
 php_conf_set "upload_tmp_dir" "${PHP_BASE_DIR}/tmp"
 php_conf_set "session.save_path" "${PHP_TMP_DIR}/session"
 
-# Log errors to stdout for easy debugging
-php_conf_set "error_log" "/dev/stderr"
-
 # Ensure directories used by PHP-FPM exist and have proper ownership and permissions
 for dir in "$PHP_CONF_DIR" "${PHP_BASE_DIR}/tmp" "$PHP_TMP_DIR" "$PHP_FPM_LOGS_DIR" "${PHP_TMP_DIR}/session"; do
     ensure_dir_exists "$dir"
@@ -39,4 +36,6 @@ info "Disabling PHP-FPM daemon user/group configuration"
 mv "${PHP_CONF_DIR}/common.conf" "${PHP_CONF_DIR}/common.conf.disabled"
 touch "${PHP_CONF_DIR}/common.conf"
 
+# Log to stdout/stderr for easy debugging
 ln -sf "/dev/stdout" "$PHP_FPM_LOG_FILE"
+php_conf_set "error_log" "/dev/stderr"