diff --git a/bitnami/drupal/9/debian-10/Dockerfile b/bitnami/drupal/9/debian-10/Dockerfile index 3b19a4602d5e..10c8ddf82454 100644 --- a/bitnami/drupal/9/debian-10/Dockerfile +++ b/bitnami/drupal/9/debian-10/Dockerfile @@ -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.1.0-debian-10-r15" \ + BITNAMI_IMAGE_VERSION="9.1.0-debian-10-r16" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh index 4119ca8312b6..b8a346e9afb0 100644 --- a/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh +++ b/bitnami/drupal/9/debian-10/rootfs/opt/bitnami/scripts/drupal-env.sh @@ -37,7 +37,6 @@ drupal_env_vars=( DRUPAL_DATABASE_USER DRUPAL_DATABASE_PASSWORD DRUPAL_DATABASE_TLS_CA_FILE - DRUPAL_DATABASE_MIN_VERSION SMTP_HOST SMTP_PORT DRUPAL_SMTP_PORT @@ -100,7 +99,6 @@ export DRUPAL_DATABASE_NAME="${DRUPAL_DATABASE_NAME:-bitnami_drupal}" # only use export DRUPAL_DATABASE_USER="${DRUPAL_DATABASE_USER:-bn_drupal}" # only used during the first initialization export DRUPAL_DATABASE_PASSWORD="${DRUPAL_DATABASE_PASSWORD:-}" # only used during the first initialization export DRUPAL_DATABASE_TLS_CA_FILE="${DRUPAL_DATABASE_TLS_CA_FILE:-}" # only used during the first initialization -export DRUPAL_DATABASE_MIN_VERSION="${DRUPAL_DATABASE_MIN_VERSION:-}" # PHP configuration export PHP_DEFAULT_MEMORY_LIMIT="256M" # only used at build time 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 15b90bd338ab..d50ae4d74bcb 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 @@ -119,9 +119,6 @@ drupal_initialize() { fi fi - # Force a change in the database minimum version requirement - is_empty_value "$DRUPAL_DATABASE_MIN_VERSION" || drupal_force_database_min_version - # Check if Drupal has already been initialized and persisted in a previous run local -r app_name="drupal" if ! is_app_initialized "$app_name"; then @@ -461,21 +458,6 @@ drupal_remove_duplicated_database_settings() { remove_in_file "$DRUPAL_CONF_FILE" "${first_line_block}/,/${last_line_block}" } -######################## -# Drupal force database minimum version requirement. -# Required for some third-party databases that report wrong versions -# Globals: -# * -# Arguments: -# None -# Returns: -# None -######################### -drupal_force_database_min_version() { - local -r install_task_file="${DRUPAL_BASE_DIR}/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php" - replace_in_file "$install_task_file" 'const MYSQL_MINIMUM_VERSION.*' "const MYSQL_MINIMUM_VERSION = '${DRUPAL_DATABASE_MIN_VERSION}';" -} - ######################## # Drupal fix htaccess warning protection. # Drupal checks for the htaccess file to prevent malicious attacks diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md index ad52411f918f..52b302df3eab 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.1.0`, `9.1.0-debian-10-r15`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.0-debian-10-r15/9/debian-10/Dockerfile) +* [`9`, `9-debian-10`, `9.1.0`, `9.1.0-debian-10-r16`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/9.1.0-debian-10-r16/9/debian-10/Dockerfile) * [`8`, `8-debian-10`, `8.9.11`, `8.9.11-debian-10-r14` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.9.11-debian-10-r14/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).