From a4bbd3d0efa3cf837617639488949433568a7b79 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 25 Sep 2020 13:10:42 +0000 Subject: [PATCH] 8.9.6-debian-10-r11 release --- bitnami/drupal/8/debian-10/Dockerfile | 16 +++------------- .../rootfs/opt/bitnami/scripts/libphp.sh | 12 +++++++----- .../rootfs/opt/bitnami/scripts/php-env.sh | 16 ++++++++++------ bitnami/drupal/README.md | 9 +++++++-- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/bitnami/drupal/8/debian-10/Dockerfile b/bitnami/drupal/8/debian-10/Dockerfile index 09f6d4ec7fc7..8f6791747db6 100644 --- a/bitnami/drupal/8/debian-10/Dockerfile +++ b/bitnami/drupal/8/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,16 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="drupal" \ - BITNAMI_IMAGE_VERSION="8.9.6-debian-10-r10" \ - DRUPAL_DATABASE_NAME="" \ - DRUPAL_DATABASE_PASSWORD="" \ - DRUPAL_DATABASE_USER="" \ - DRUPAL_EMAIL="" \ - DRUPAL_HTTPS_PORT="" \ - DRUPAL_HTTP_PORT="" \ - DRUPAL_PASSWORD="" \ - DRUPAL_PROFILE="" \ - DRUPAL_USERNAME="" \ + BITNAMI_IMAGE_VERSION="8.9.6-debian-10-r11" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ @@ -51,8 +42,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ MYSQL_CLIENT_CREATE_DATABASE_USER="" \ MYSQL_CLIENT_ENABLE_SSL="no" \ MYSQL_CLIENT_SSL_CA_FILE="" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH" \ - PHP_MEMORY_LIMIT="" + PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libphp.sh index 4e14d5d2fc5e..e3a8fcf73ae1 100644 --- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libphp.sh +++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/libphp.sh @@ -25,11 +25,11 @@ php_conf_set() { local -r key="${1:?key missing}" local -r value="${2:?value missing}" local -r file="${3:-"$PHP_CONF_FILE"}" - local pattern="^[;\s]*${key}\s*=.*$" + local pattern="^[; ]*${key}\s*=.*$" if [[ "$key" = "extension" || "$key" = "zend_extension" ]]; then # The "extension" property works a bit different for PHP, as there is one per module to be included, meaning it is additive unlike other configurations # Because of that, we first check if the extension was defined in the file to replace the proper entry - pattern="^[;\s]*${key}\s*=\s*[\"]?${value}(\.so)?[\"]?\s*$" + pattern="^[; ]*${key}\s*=\s*[\"]?${value}(\.so)?[\"]?\s*$" fi local -r entry="${key} = ${value}" if is_file_writable "$file"; then @@ -56,10 +56,12 @@ php_conf_set() { php_initialize() { # Configure PHP options based on the runtime environment info "Configuring PHP options" - ! 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" + ! is_empty_value "$PHP_MAX_INPUT_TIME" && info "Setting PHP max_input_time option" && php_conf_set max_input_time "$PHP_MAX_INPUT_TIME" + ! is_empty_value "$PHP_MAX_INPUT_VARS" && info "Setting PHP max_input_vars option" && php_conf_set max_input_time "$PHP_MAX_INPUT_VARS" + ! 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" # 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/8/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/php-env.sh index 8ae33bca4b43..1bc788106371 100644 --- a/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/php-env.sh +++ b/bitnami/drupal/8/debian-10/rootfs/opt/bitnami/scripts/php-env.sh @@ -19,10 +19,12 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" # variable will be overridden with the value specified in that file php_env_vars=( PHP_FPM_LISTEN_ADDRESS - PHP_UPLOAD_MAX_FILESIZE - PHP_POST_MAX_SIZE - PHP_MEMORY_LIMIT PHP_MAX_EXECUTION_TIME + PHP_MAX_INPUT_TIME + PHP_MAX_INPUT_VARS + PHP_MEMORY_LIMIT + PHP_POST_MAX_SIZE + PHP_UPLOAD_MAX_FILESIZE ) for env_var in "${php_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -60,9 +62,11 @@ export PHP_FPM_DAEMON_USER="daemon" export PHP_FPM_DAEMON_GROUP="daemon" # PHP configuration -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:-}" +export PHP_MAX_INPUT_TIME="${PHP_MAX_INPUT_TIME:-}" +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:-}" # Custom environment variables may be defined below diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md index f12e3edf8202..fcc09c5229bb 100644 --- a/bitnami/drupal/README.md +++ b/bitnami/drupal/README.md @@ -40,7 +40,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`9`, `9-debian-10`, `9.0.6`, `9.0.6-debian-10-r9`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.0.6-debian-10-r9/9/debian-10/Dockerfile) -* [`8`, `8-debian-10`, `8.9.6`, `8.9.6-debian-10-r10` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.6-debian-10-r10/8/debian-10/Dockerfile) +* [`8`, `8-debian-10`, `8.9.6`, `8.9.6-debian-10-r11` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.6-debian-10-r11/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal). @@ -262,7 +262,12 @@ To configure Drupal to send email using SMTP you can set the following environme ##### PHP configuration -- `PHP_MEMORY_LIMIT`: Memory limit for PHP. Default: **256M** +- `PHP_MAX_EXECUTION_TIME`: Maximum execution time for PHP scripts. No default. +- `PHP_MAX_INPUT_TIME`: Maximum input time for PHP scripts. No default. +- `PHP_MAX_INPUT_VARS`: Maximum amount of input variables for PHP scripts. No default. +- `PHP_MEMORY_LIMIT`: Memory limit for PHP scripts. Default: **256M** +- `PHP_POST_MAX_SIZE`: Maximum size for PHP POST requests. No default. +- `PHP_UPLOAD_MAX_FILESIZE`: Maximum file size for PHP uploads. No default. ##### Example