From 3806f0978e0ccc970ac0803e8fbd35afabfed13e Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 20 Nov 2020 13:41:02 +0000
Subject: [PATCH] 9.0.8-debian-10-r1 release

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

diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index 3ccfc1039fae..a565aa2209a8 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/debian-10/Dockerfile
@@ -31,7 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="9.0.8-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="9.0.8-debian-10-r1" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh
index cd2fc26bf0cb..15b90bd338ab 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh
@@ -257,13 +257,22 @@ drupal_wait_for_db_connection() {
 drupal_site_install() {
     is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE" || drupal_set_database_ssl_settings
 
-    drush_execute "-y" "site:install" "$DRUPAL_PROFILE" \
-        "--db-url=mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}:${DRUPAL_DATABASE_PORT_NUMBER}/${DRUPAL_DATABASE_NAME}" \
-        "--account-name=${DRUPAL_USERNAME}" \
-        "--account-mail=${DRUPAL_EMAIL}" \
-        "--account-pass=${DRUPAL_PASSWORD}" \
-        "--site-name=${DRUPAL_SITE_NAME}" \
-        "--site-mail=${DRUPAL_EMAIL}"
+    (
+        # Unfortunately there is no way to disable mail sending via sendmail when installing Drupal
+        # The "hack" consists of overriding the sendmail path to an executable that does nothing (i.e. "/bin/true")
+        # This is also what Drush is doing in their CI
+        PHP_OPTIONS="-d sendmail_path=$(which true)"
+        export PHP_OPTIONS
+
+        drush_execute "site:install" \
+            "--db-url=mysql://${DRUPAL_DATABASE_USER}:${DRUPAL_DATABASE_PASSWORD}@${DRUPAL_DATABASE_HOST}:${DRUPAL_DATABASE_PORT_NUMBER}/${DRUPAL_DATABASE_NAME}" \
+            "--account-name=${DRUPAL_USERNAME}" \
+            "--account-mail=${DRUPAL_EMAIL}" \
+            "--account-pass=${DRUPAL_PASSWORD}" \
+            "--site-name=${DRUPAL_SITE_NAME}" \
+            "--site-mail=${DRUPAL_EMAIL}" \
+            "-y" "$DRUPAL_PROFILE"
+    )
 
     # When Drupal settings are patched to allow SSL database connections, the database settings block is duplicated
     # after the installation with Drush
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index c831dc3173d6..61d771506d11 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.0.8`, `9.0.8-debian-10-r0`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.8-debian-10-r0/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.0.8`, `9.0.8-debian-10-r1`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.8-debian-10-r1/9/debian-10/Dockerfile)
 * [`8`, `8-debian-10`, `8.9.9`, `8.9.9-debian-10-r1` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.9-debian-10-r1/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).