diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile index d5961293e681..c873ebfd1f0f 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.2-debian-10-r8" \ + BITNAMI_IMAGE_VERSION="9.0.2-debian-10-r9" \ DRUPAL_DATABASE_NAME="" \ DRUPAL_DATABASE_PASSWORD="" \ DRUPAL_DATABASE_USER="" \ diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal/setup.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal/setup.sh index 1844c2136a2c..514792f90724 100755 --- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal/setup.sh +++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal/setup.sh @@ -10,7 +10,7 @@ set -o pipefail # Load Drupal environment . /opt/bitnami/scripts/drupal-env.sh -# Load MySQL Client environment for 'mysql_remote_execute' (after 'moodle-env.sh' so that MODULE is not set to a wrong value) +# Load MySQL Client environment for 'mysql_remote_execute' (after 'drupal-env.sh' so that MODULE is not set to a wrong value) if [[ -f /opt/bitnami/scripts/mysql-client-env.sh ]]; then . /opt/bitnami/scripts/mysql-client-env.sh elif [[ -f /opt/bitnami/scripts/mysql-env.sh ]]; then 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 204162ddf497..5cb24a6d6a56 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 @@ -314,6 +314,8 @@ drupal_flush_cache() { if [[ "$major_version" -gt 7 ]]; then drush_execute "cache:rebuild" else + # This is occasionally needed by modules that make system-wide changes to access levels. + drush_execute php-eval 'node_access_rebuild();' drush_execute "cache:clear" "all" fi } 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 92ca554d4013..4e14d5d2fc5e 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 @@ -59,6 +59,7 @@ php_initialize() { ! 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_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_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT" + ! is_empty_value "$PHP_MAX_EXECUTION_TIME" && info "Setting PHP max_execution_time option" && php_conf_set max_execution_time "$PHP_MAX_EXECUTION_TIME" # 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" @@ -96,6 +97,19 @@ php_fpm_stop() { stop_service_using_pid "$PHP_FPM_PID_FILE" "$signal" } +######################## +# Reload PHP-FPM configuration +# Globals: +# PHP_FPM_PID_FILE +# Arguments: +# None +# Returns: +# None +######################### +php_fpm_reload() { + php_fpm_stop "USR2" +} + ######################## # Check if PHP-FPM is running # Globals: 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 60633c6ac219..4c9fd6739481 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 @@ -22,6 +22,7 @@ php_env_vars=( PHP_UPLOAD_MAX_FILESIZE PHP_POST_MAX_SIZE PHP_MEMORY_LIMIT + PHP_MAX_EXECUTION_TIME ) for env_var in "${php_env_vars[@]}"; do @@ -63,5 +64,6 @@ export PHP_FPM_DAEMON_GROUP="daemon" export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}" export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}" export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-}" +export PHP_MAX_EXECUTION_TIME="${PHP_MAX_EXECUTION_TIME:-}" # Custom environment variables may be defined below diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md index 4b9e64d7c41a..df9840d51423 100644 --- a/bitnami/drupal/README.md +++ b/bitnami/drupal/README.md @@ -39,7 +39,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-debian-10`, `9.0.2-debian-10-r8`, `9`, `9.0.2`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.2-debian-10-r8/9/debian-10/Dockerfile) +* [`9-debian-10`, `9.0.2-debian-10-r9`, `9`, `9.0.2`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.2-debian-10-r9/9/debian-10/Dockerfile) * [`8-debian-10`, `8.9.2-debian-10-r18`, `8`, `8.9.2` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.2-debian-10-r18/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).