From f10c5bf0aa9c4d1e5651d244c99fbcc7015e78c4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Sat, 11 Dec 2021 03:28:48 +0000
Subject: [PATCH] 9.3.0-debian-10-r2 release

---
 bitnami/drupal-nginx/9/debian-10/Dockerfile        |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libfs.sh        | 14 ++++++++++----
 bitnami/drupal-nginx/README.md                     |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bitnami/drupal-nginx/9/debian-10/Dockerfile b/bitnami/drupal-nginx/9/debian-10/Dockerfile
index 0d98470e3635..f1f69c6e5269 100644
--- a/bitnami/drupal-nginx/9/debian-10/Dockerfile
+++ b/bitnami/drupal-nginx/9/debian-10/Dockerfile
@@ -25,7 +25,7 @@ RUN /opt/bitnami/scripts/drupal/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="drupal-nginx" \
-    BITNAMI_IMAGE_VERSION="9.3.0-debian-10-r1" \
+    BITNAMI_IMAGE_VERSION="9.3.0-debian-10-r2" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index b438c913341d..1b504b1df458 100644
--- a/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -20,8 +20,13 @@
 owned_by() {
     local path="${1:?path is missing}"
     local owner="${2:?owner is missing}"
+    local group="${3:-}"
 
-    chown "$owner":"$owner" "$path"
+    if [[ -n $group ]]; then
+        chown "$owner":"$group" "$path"
+    else
+        chown "$owner":"$owner" "$path"
+    fi
 }
 
 ########################
@@ -34,11 +39,12 @@ owned_by() {
 #########################
 ensure_dir_exists() {
     local dir="${1:?directory is missing}"
-    local owner="${2:-}"
+    local owner_user="${2:-}"
+    local owner_group="${3:-}"
 
     mkdir -p "${dir}"
-    if [[ -n $owner ]]; then
-        owned_by "$dir" "$owner"
+    if [[ -n $owner_user ]]; then
+        owned_by "$dir" "$owner_user" "$owner_group"
     fi
 }
 
diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md
index 7d541fa084f4..ed80f68e08a7 100644
--- a/bitnami/drupal-nginx/README.md
+++ b/bitnami/drupal-nginx/README.md
@@ -37,7 +37,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`9`, `9-debian-10`, `9.3.0`, `9.3.0-debian-10-r1`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.0-debian-10-r1/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.3.0`, `9.3.0-debian-10-r2`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.3.0-debian-10-r2/9/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).