diff --git a/bitnami/drupal/9/debian-11/Dockerfile b/bitnami/drupal/9/debian-11/Dockerfile index 8dcae9e59a50..d83726a5a299 100644 --- a/bitnami/drupal/9/debian-11/Dockerfile +++ b/bitnami/drupal/9/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="9.4.8-debian-11-r14" \ + org.opencontainers.image.ref.name="9.4.8-debian-11-r15" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal" \ org.opencontainers.image.title="drupal" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -25,7 +25,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "apache-2.4.54-157-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.11-0-linux-${OS_ARCH}-debian-11" \ "libphp-8.1.12-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.4-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \ "drupal-9.4.8-3-linux-${OS_ARCH}-debian-11" \ ) && \ diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9690f9c45ba1..f2c05133765b 100644 --- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -43,9 +43,9 @@ }, "render-template": { "arch": "amd64", - "digest": "cb0a32f121f58797a77247fe41ae2b9f9b705bdf170f55015963c667edca6360", + "digest": "f0e1eb23624312a8ee0c4e5bab439960831424ecd76c88bdc24141a338406f05", "distro": "debian-11", "type": "NAMI", - "version": "1.0.3-154" + "version": "1.0.4-0" } } \ No newline at end of file diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh index 341d8b4b3c02..a90f588acf93 100644 --- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh +++ b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libdrupal.sh @@ -369,11 +369,7 @@ drush_config_set() { local -r value="${3:-}" local -r major_version="$(get_sematic_version "$(drupal_get_version)" 1)" - if [[ "$major_version" -gt 7 ]]; then - drush_execute "config-set" "--yes" "$group" "$key" "$value" - else - drush_execute "variable-set" "$key" "$value" - fi + drush_execute "config-set" "--yes" "$group" "$key" "$value" } ######################## @@ -419,12 +415,7 @@ drupal_configure_smtp() { drush_execute "pm:enable" "--yes" "smtp" - if [[ "$major_version" -gt 7 ]]; then - drush_config_set "system.mail" "interface.default" "SMTPMailSystem" - else - drush_execute "php:eval" 'variable_set("mail_system", array("default-system" => "SmtpMailSystem"))' - fi - + drush_config_set "system.mail" "interface.default" "SMTPMailSystem" drush_config_set "smtp.settings" "smtp_on" "1" drush_config_set "smtp.settings" "smtp_host" "$DRUPAL_SMTP_HOST" drush_config_set "smtp.settings" "smtp_port" "$DRUPAL_SMTP_PORT_NUMBER" @@ -446,13 +437,7 @@ drupal_configure_smtp() { ######################### drupal_flush_cache() { local -r major_version="$(get_sematic_version "$(drupal_get_version)" 1)" - 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 + drush_execute "cache:rebuild" } ########################