From 720dcfdbdb215e187f1b47e2b2772238e6ead472 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Sat, 29 Aug 2020 02:47:33 +0000
Subject: [PATCH] 8.9.3-debian-10-r13 release

---
 bitnami/drupal-nginx/8/debian-10/Dockerfile                   | 4 ++--
 .../8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh  | 3 ++-
 bitnami/drupal-nginx/README.md                                | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bitnami/drupal-nginx/8/debian-10/Dockerfile b/bitnami/drupal-nginx/8/debian-10/Dockerfile
index aa2ac73d4b29..2b0dfc614a83 100644
--- a/bitnami/drupal-nginx/8/debian-10/Dockerfile
+++ b/bitnami/drupal-nginx/8/debian-10/Dockerfile
@@ -20,14 +20,14 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh
 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="8.9.3-debian-10-r12" \
+    BITNAMI_IMAGE_VERSION="8.9.3-debian-10-r13" \
     DRUPAL_DATABASE_NAME="" \
     DRUPAL_DATABASE_PASSWORD="" \
     DRUPAL_DATABASE_USER="" \
diff --git a/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 3b961b123445..c054e42442ab 100644
--- a/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -375,7 +375,8 @@ wait_for_mysql() {
 #########################
 wait_for_mysql_access() {
     # wait until the server is up and answering queries.
-    local -a args=("mysql" "root")
+    local -r user="${1:-root}"
+    local -a args=("mysql" "$user")
     is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("$(get_master_env_var_value ROOT_PASSWORD)")
     local -r retries=300
     local -r sleep_time=2
diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md
index a42cc6b11104..2e518bc51fff 100644
--- a/bitnami/drupal-nginx/README.md
+++ b/bitnami/drupal-nginx/README.md
@@ -41,7 +41,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`9`, `9-debian-10`, `9.0.3`, `9.0.3-debian-10-r13`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.0.3-debian-10-r13/9/debian-10/Dockerfile)
-* [`8`, `8-debian-10`, `8.9.3`, `8.9.3-debian-10-r12` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.3-debian-10-r12/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.3`, `8.9.3-debian-10-r13` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.3-debian-10-r13/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).