From 391d060cf58ddf51d6f0d525a32885953fecbbfc Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 30 Oct 2020 15:43:26 +0000
Subject: [PATCH] 9.0.7-debian-10-r23 release

---
 bitnami/drupal/9/debian-10/Dockerfile                         | 4 ++--
 .../drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh   | 1 +
 .../drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh  | 2 ++
 bitnami/drupal/README.md                                      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile
index 6ac184fec67e..92358c98bc6c 100644
--- a/bitnami/drupal/9/debian-10/Dockerfile
+++ b/bitnami/drupal/9/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="9.0.7-debian-10-r22" \
+    BITNAMI_IMAGE_VERSION="9.0.7-debian-10-r23" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
index 75b65a618df5..6f76902be990 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
@@ -62,6 +62,7 @@ php_initialize() {
     ! is_empty_value "$PHP_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT"
     ! is_empty_value "$PHP_POST_MAX_SIZE" && info "Setting PHP post_max_size option" && php_conf_set post_max_size "$PHP_POST_MAX_SIZE"
     ! is_empty_value "$PHP_UPLOAD_MAX_FILESIZE" && info "Setting PHP upload_max_filesize option" && php_conf_set upload_max_filesize "$PHP_UPLOAD_MAX_FILESIZE"
+    is_yes_no_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$(php_convert_to_boolean "$PHP_EXPOSE_PHP")"
 
     # PHP-FPM configuration
     ! is_empty_value "$PHP_FPM_LISTEN_ADDRESS" && info "Setting PHP-FPM listen option" && php_conf_set "listen" "$PHP_FPM_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm.d/www.conf"
diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index 1bc788106371..7b974fab2511 100644
--- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
@@ -25,6 +25,7 @@ php_env_vars=(
     PHP_MEMORY_LIMIT
     PHP_POST_MAX_SIZE
     PHP_UPLOAD_MAX_FILESIZE
+    PHP_EXPOSE_PHP
 )
 for env_var in "${php_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -68,5 +69,6 @@ export PHP_MAX_INPUT_VARS="${PHP_MAX_INPUT_VARS:-}"
 export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-}"
 export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}"
 export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}"
+export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-yes}"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index d05b79a59fea..f60aeb36aabe 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.7`, `9.0.7-debian-10-r22`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.7-debian-10-r22/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.0.7`, `9.0.7-debian-10-r23`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.7-debian-10-r23/9/debian-10/Dockerfile)
 * [`8`, `8-debian-10`, `8.9.7`, `8.9.7-debian-10-r22` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.7-debian-10-r22/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).