9.1.8-debian-10-r1 release

bitnami/drupal-nginx/9/debian-10/Dockerfile

@@ -18,14 +18,14 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "9.1.8-0
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh
 RUN /opt/bitnami/scripts/drupal/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="drupal-nginx" \
-    BITNAMI_IMAGE_VERSION="9.1.8-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="9.1.8-debian-10-r1" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \

bitnami/drupal-nginx/9/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh

@@ -180,6 +180,7 @@ web_server_reload() {
 #   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
+#   --nginx-external-configuration - Configuration external to server block (no default)
 # Returns:
 #   true if the configuration was enabled, false otherwise
 ########################
@@ -220,7 +221,8 @@ ensure_web_server_app_configuration_exists() {
                 ;;
 
             # Specific NGINX flags
-            --nginx-additional-configuration)
+            --nginx-additional-configuration \
+            | --nginx-external-configuration)
                 nginx_args+=("${1//nginx-/}" "${2:?missing value}")
                 shift
                 ;;

bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh

@@ -285,6 +285,8 @@ mysql_remote_execute_print_output() {
     local -r hostname="${1:?hostname is required}"
     local -r port="${2:?port is required}"
     local -a args=("-h" "$hostname" "-P" "$port" "--connect-timeout=5")
+    # When using "localhost" it would try to connect to the socket, which will not exist for mysql-client
+    [[ -n "${MYSQL_CLIENT_FLAVOR:-}" && "$hostname" = "localhost" ]] && args+=("--protocol=tcp")
     shift 2
     "mysql_execute_print_output" "$@" "${args[@]}"
 }

bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/libnginx.sh

@@ -172,6 +172,7 @@ nginx_initialize() {
 #   --http-port - HTTP port number
 #   --https-port - HTTPS port number
 #   --additional-configuration - Additional server block configuration (no default)
+#   --external-configuration - Configuration external to server block (no default)
 #   --document-root - Path to document root directory
 # Returns:
 #   true if the configuration was enabled, false otherwise
@@ -189,6 +190,7 @@ ensure_nginx_app_configuration_exists() {
     local var_name
     # Template variables defaults
     export additional_configuration=""
+    export external_configuration=""
     export document_root="${BITNAMI_ROOT_DIR}/${app}"
     # Validate arguments
     shift
@@ -205,6 +207,7 @@ ensure_nginx_app_configuration_exists() {
             | --http-port \
             | --https-port \
             | --additional-configuration \
+            | --external-configuration \
             | --document-root \
             | --extra-directory-configuration \
             )
@@ -247,6 +250,7 @@ absolute_redirect off;"
     # Indent configurations
     acl_configuration="$(indent "$acl_configuration" 4)"
     additional_configuration=$'\n'"$(indent "$additional_configuration" 4)"
+    external_configuration=$'\n'"$external_configuration"
     http_listen_configuration="$(indent "$http_listen_configuration" 4)"
     https_listen_configuration="$(indent "$https_listen_configuration" 4)"
     # Render templates

bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-http-server-block.conf.tpl

@@ -1,3 +1,5 @@
+{{external_configuration}}
+
 server {
     # Port to listen on, can also be set in IP:PORT format
     {{http_listen_configuration}}

bitnami/drupal-nginx/9/debian-10/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-https-server-block.conf.tpl

@@ -1,3 +1,5 @@
+{{external_configuration}}
+
 server {
     # Port to listen on, can also be set in IP:PORT format
     {{https_listen_configuration}}

bitnami/drupal-nginx/README.md

@@ -42,7 +42,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.8`, `9.1.8-debian-10-r0`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.1.8-debian-10-r0/9/debian-10/Dockerfile)
+* [`9`, `9-debian-10`, `9.1.8`, `9.1.8-debian-10-r1`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.1.8-debian-10-r1/9/debian-10/Dockerfile)
 * [`8`, `8-debian-10`, `8.9.15`, `8.9.15-debian-10-r0` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.15-debian-10-r0/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).