8.9.13-debian-10-r72 release

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

@@ -18,14 +18,14 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "drupal" "8.9.13-
 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="8.9.13-debian-10-r71" \
+    BITNAMI_IMAGE_VERSION="8.9.13-debian-10-r72" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \

bitnami/drupal-nginx/8/debian-10/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   mariadb:
-    image: 'docker.io/bitnami/mariadb:10.5-debian-10'
+    image: docker.io/bitnami/mariadb:10.5
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
       - MARIADB_USER=bn_drupal
@@ -9,7 +9,7 @@ services:
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   drupal:
-    image: 'docker.io/bitnami/drupal-nginx:8-debian-10'
+    image: docker.io/bitnami/drupal-nginx:8
     ports:
       - '80:8080'
       - '443:8443'

bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh

@@ -26,6 +26,8 @@ drupal_env_vars=(
     DRUPAL_SITE_NAME
     DRUPAL_SKIP_BOOTSTRAP
     DRUPAL_ENABLE_MODULES
+    DRUPAL_CONFIG_SYNC_DIR
+    DRUPAL_HASH_SALT
     DRUPAL_USERNAME
     DRUPAL_PASSWORD
     DRUPAL_EMAIL
@@ -77,6 +79,8 @@ export DRUPAL_PROFILE="${DRUPAL_PROFILE:-standard}" # only used during the first
 export DRUPAL_SITE_NAME="${DRUPAL_SITE_NAME:-My blog}" # only used during the first initialization
 export DRUPAL_SKIP_BOOTSTRAP="${DRUPAL_SKIP_BOOTSTRAP:-}" # only used during the first initialization
 export DRUPAL_ENABLE_MODULES="${DRUPAL_ENABLE_MODULES:-}" # only used during the first initialization
+export DRUPAL_CONFIG_SYNC_DIR="${DRUPAL_CONFIG_SYNC_DIR:-}" # only used during the first initialization
+export DRUPAL_HASH_SALT="${DRUPAL_HASH_SALT:-}" # only used during the first initialization
 
 # Drupal credentials
 export DRUPAL_USERNAME="${DRUPAL_USERNAME:-user}" # only used during the first initialization

bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libdrupal.sh

@@ -147,6 +147,18 @@ drupal_initialize() {
             drupal_flush_cache
         else
             info "An already initialized Drupal database was provided, configuration will be skipped"
+            if is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE"; then
+                drupal_set_database_settings
+            else
+                drupal_set_database_ssl_settings
+            fi
+
+            # Drupal expects a directory for storing site configuration
+            # For more info see https://www.drupal.org/docs/configuration-management
+            drupal_create_config_directory
+
+            # Drupal needs a hash value to build one-time login links, cancel links, form tokens, etc.
+            drupal_set_hash_salt
             drupal_update_database
         fi
 
@@ -280,6 +292,41 @@ drupal_site_install() {
     fi
 }
 
+########################
+# Create Drupal sync configuration directory (DRUPAL_SKIP_BOOTSTRAP only)
+# Globals:
+#   DRUPAL_BASE_DIR
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+drupal_create_config_directory() {
+    local config_sync_dir="${DRUPAL_CONFIG_SYNC_DIR:-}"
+    if is_empty_value "$config_sync_dir"; then
+        config_sync_dir="${DRUPAL_BASE_DIR}/sites/default/files/config_$(generate_random_string -t alphanumeric -c 16)"
+    fi
+    ensure_dir_exists "$config_sync_dir"
+    drupal_conf_set "\$settings['config_sync_directory']" "$config_sync_dir"
+}
+
+########################
+# Create Drupal hash salt value (DRUPAL_SKIP_BOOTSTRAP only)
+# Globals:
+#   DRUPAL_HASH_SALT
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+drupal_set_hash_salt() {
+    local hash_salt="${DRUPAL_HASH_SALT:-}"
+    if is_empty_value "$hash_salt"; then
+        hash_salt="$(generate_random_string -t alphanumeric -c 32)"
+    fi
+    drupal_conf_set "\$settings['hash_salt']" "$hash_salt"
+}
+
 ########################
 # Execute Drush Tool
 # Globals:
@@ -442,6 +489,30 @@ drupal_set_database_ssl_settings() {
 EOF
 }
 
+########################
+# Drupal set database non-SSL settings (DRUPAL_SKIP_BOOTSTRAP only)
+# Globals:
+#   *
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+drupal_set_database_settings() {
+    cat >>"$DRUPAL_CONF_FILE" <<EOF
+\$databases['default']['default'] = array ( // Database block with SSL support
+  'database' => '${DRUPAL_DATABASE_NAME}',
+  'username' => '${DRUPAL_DATABASE_USER}',
+  'password' => '${DRUPAL_DATABASE_PASSWORD}',
+  'prefix' => '',
+  'host' => '${DRUPAL_DATABASE_HOST}',
+  'port' => '${DRUPAL_DATABASE_PORT_NUMBER}',
+  'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
+  'driver' => 'mysql',
+);
+EOF
+}
+
 ########################
 # Drupal remove duplicated database block from settings file
 # Globals:

bitnami/drupal-nginx/README.md

@@ -43,7 +43,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`9`, `9-debian-10`, `9.1.5`, `9.1.5-debian-10-r33`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.1.5-debian-10-r33/9/debian-10/Dockerfile)
-* [`8`, `8-debian-10`, `8.9.13`, `8.9.13-debian-10-r71` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.13-debian-10-r71/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.9.13`, `8.9.13-debian-10-r72` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.13-debian-10-r72/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).