From 03b8405aea2720b4ec99f7e302846dfbfc7e8867 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 13 Apr 2021 04:22:35 +0000
Subject: [PATCH] 9.1.6-debian-10-r5 release

---
 bitnami/drupal/9/debian-10/Dockerfile                       | 2 +-
 .../debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh  | 6 ++++--
 .../rootfs/opt/bitnami/scripts/mysql-client-env.sh          | 2 ++
 bitnami/drupal/README.md                                    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index 2b813a4d0c27..6bc180c94c44 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="9.1.6-debian-10-r4" \
+    BITNAMI_IMAGE_VERSION="9.1.6-debian-10-r5" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 3dc97a940cbf..61a5daf0a944 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -78,6 +78,7 @@ mysql_client_validate() {
 ########################
 # Perform actions to a database
 # Globals:
+#   DB_*
 #   MYSQL_CLIENT_*
 # Arguments:
 #   None
@@ -122,6 +123,7 @@ mysql_client_initialize() {
 ########################
 # Wrap binary to force the usage of SSL
 # Globals:
+#   DB_*
 #   MYSQL_CLIENT_*
 # Arguments:
 #   None
@@ -129,8 +131,8 @@ mysql_client_initialize() {
 #   None
 #########################
 mysql_client_wrap_binary_for_ssl() {
-    local -r wrapper_file="${MYSQL_CLIENT_BIN_DIR}/mysql"
-    local -r wrapped_binary_file="${MYSQL_CLIENT_BASE_DIR}/.bin/mysql"
+    local -r wrapper_file="${DB_BIN_DIR}/mysql"
+    local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql"
     local -a ssl_opts=()
     read -r -a ssl_opts <<< "$(mysql_client_extra_opts)"
 
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
index cae196ceeba2..89acd0dc1c4d 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
@@ -77,6 +77,8 @@ export PATH="${DB_SBIN_DIR}:${DB_BIN_DIR}:/opt/bitnami/common/bin:${PATH}"
 # System users (when running with a privileged user)
 export DB_DAEMON_USER="mysql"
 export DB_DAEMON_GROUP="mysql"
+
+# MySQL client configuration
 export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}"
 MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN="${MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN:-"${MARIADB_AUTHENTICATION_PLUGIN:-}"}"
 export MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN="${MYSQL_CLIENT_DATABASE_AUTHENTICATION_PLUGIN:-}"
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index fac20ff58309..6a639d570c5a 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -41,7 +41,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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.1.6`, `9.1.6-debian-10-r4`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.6-debian-10-r4/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.1.6`, `9.1.6-debian-10-r5`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.6-debian-10-r5/9/debian-10/Dockerfile)
 * [`8`, `8-debian-10`, `8.9.13`, `8.9.13-debian-10-r77` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.13-debian-10-r77/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).