From 48f32c0bd0bcc04620644ca5dba7e8f46d308f38 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Sat, 17 Apr 2021 03:17:42 +0000
Subject: [PATCH] 9.1.6-debian-10-r9 release

---
 bitnami/drupal/9/debian-10/Dockerfile         |  4 +-
 .../opt/bitnami/scripts/libmysqlclient.sh     | 43 -------------------
 bitnami/drupal/README.md                      |  2 +-
 3 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index 3e87e2152a45..2aff0cdb30e8 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.1.6-2
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/drupal/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -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-r8" \
+    BITNAMI_IMAGE_VERSION="9.1.6-debian-10-r9" \
     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 61a5daf0a944..e4f35f989c82 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
@@ -341,49 +341,6 @@ is_mysql_not_running() {
     ! is_mysql_running
 }
 
-########################
-# Starts MySQL/MariaDB in the background and waits until it's ready
-# Globals:
-#   DB_*
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-mysql_start_bg() {
-    local -a flags=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}" "--socket=${DB_SOCKET_FILE}")
-
-    # Only allow local connections until MySQL is fully initialized, to avoid apps trying to connect to MySQL before it is fully initialized
-    flags+=("--bind-address=127.0.0.1")
-
-    # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable
-    read -r -a db_extra_flags <<< "$(mysql_extra_flags)"
-    [[ "${#db_extra_flags[@]}" -gt 0 ]] && flags+=("${db_extra_flags[@]}")
-
-    # Do not start as root, to avoid permission issues
-    am_i_root && flags+=("--user=${DB_DAEMON_USER}")
-
-    # The slave should only start in 'run.sh', elseways user credentials would be needed for any connection
-    flags+=("--skip-slave-start")
-    flags+=("$@")
-
-    is_mysql_running && return
-
-    info "Starting $DB_FLAVOR in background"
-    debug_execute "${DB_SBIN_DIR}/mysqld" "${flags[@]}" &
-
-    # we cannot use wait_for_mysql_access here as mysql_upgrade for MySQL >=8 depends on this command
-    # users are not configured on slave nodes during initialization due to --skip-slave-start
-    wait_for_mysql
-
-    # Special configuration flag for system with slow disks that could take more time
-    # in initializing
-    if [[ -n "${DB_INIT_SLEEP_TIME}" ]]; then
-        debug "Sleeping ${DB_INIT_SLEEP_TIME} seconds before continuing with initialization"
-        sleep "${DB_INIT_SLEEP_TIME}"
-    fi
-}
-
 ########################
 # Wait for MySQL/MariaDB to be running
 # Globals:
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 10f6980d43b9..13ab99c3aa92 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-r8`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.6-debian-10-r8/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.1.6`, `9.1.6-debian-10-r9`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.6-debian-10-r9/9/debian-10/Dockerfile)
 * [`8`, `8-debian-10`, `8.9.13`, `8.9.13-debian-10-r82` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.13-debian-10-r82/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).