From f8e889cdcac7f36a725fa9a722cea9439ef7e68d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 24 Dec 2020 03:29:08 +0000
Subject: [PATCH] 8.9.11-debian-10-r15 release

---
 bitnami/drupal/8/debian-10/Dockerfile          |  4 ++--
 .../rootfs/opt/bitnami/scripts/drupal-env.sh   |  2 --
 .../rootfs/opt/bitnami/scripts/libdrupal.sh    | 18 ------------------
 bitnami/drupal/README.md                       |  2 +-
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/bitnami/drupal/8/debian-10/Dockerfile b/bitnami/drupal/8/debian-10/Dockerfile
index 5689257bbc09..e9804896ff70 100644
--- a/bitnami/drupal/8/debian-10/Dockerfile
+++ b/bitnami/drupal/8/debian-10/Dockerfile
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get upgrade -y && \
 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
@@ -31,7 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="8.9.11-debian-10-r14" \
+    BITNAMI_IMAGE_VERSION="8.9.11-debian-10-r15" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh
index 4119ca8312b6..b8a346e9afb0 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh
@@ -37,7 +37,6 @@ drupal_env_vars=(
     DRUPAL_DATABASE_USER
     DRUPAL_DATABASE_PASSWORD
     DRUPAL_DATABASE_TLS_CA_FILE
-    DRUPAL_DATABASE_MIN_VERSION
     SMTP_HOST
     SMTP_PORT
     DRUPAL_SMTP_PORT
@@ -100,7 +99,6 @@ export DRUPAL_DATABASE_NAME="${DRUPAL_DATABASE_NAME:-bitnami_drupal}" # only use
 export DRUPAL_DATABASE_USER="${DRUPAL_DATABASE_USER:-bn_drupal}" # only used during the first initialization
 export DRUPAL_DATABASE_PASSWORD="${DRUPAL_DATABASE_PASSWORD:-}" # only used during the first initialization
 export DRUPAL_DATABASE_TLS_CA_FILE="${DRUPAL_DATABASE_TLS_CA_FILE:-}" # only used during the first initialization
-export DRUPAL_DATABASE_MIN_VERSION="${DRUPAL_DATABASE_MIN_VERSION:-}"
 
 # PHP configuration
 export PHP_DEFAULT_MEMORY_LIMIT="256M" # only used at build time
diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh
index 15b90bd338ab..d50ae4d74bcb 100644
--- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh
+++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh
@@ -119,9 +119,6 @@ drupal_initialize() {
         fi
     fi
 
-    # Force a change in the database minimum version requirement
-    is_empty_value "$DRUPAL_DATABASE_MIN_VERSION" || drupal_force_database_min_version
-
     # Check if Drupal has already been initialized and persisted in a previous run
     local -r app_name="drupal"
     if ! is_app_initialized "$app_name"; then
@@ -461,21 +458,6 @@ drupal_remove_duplicated_database_settings() {
     remove_in_file "$DRUPAL_CONF_FILE" "${first_line_block}/,/${last_line_block}"
 }
 
-########################
-# Drupal force database minimum version requirement.
-# Required for some third-party databases that report wrong versions
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-drupal_force_database_min_version() {
-    local -r install_task_file="${DRUPAL_BASE_DIR}/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php"
-    replace_in_file "$install_task_file" 'const MYSQL_MINIMUM_VERSION.*' "const MYSQL_MINIMUM_VERSION = '${DRUPAL_DATABASE_MIN_VERSION}';"
-}
-
 ########################
 # Drupal fix htaccess warning protection.
 # Drupal checks for the htaccess file to prevent malicious attacks
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 52b302df3eab..9efc04a9c5c4 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -42,7 +42,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`9`, `9-debian-10`, `9.1.0`, `9.1.0-debian-10-r16`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.0-debian-10-r16/9/debian-10/Dockerfile)
-* [`8`, `8-debian-10`, `8.9.11`, `8.9.11-debian-10-r14` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.11-debian-10-r14/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.11`, `8.9.11-debian-10-r15` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.11-debian-10-r15/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).