From 51d8974b0dc1fc56b317eefca69e7dcaee589191 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 10 Jul 2026 19:40:04 +0200 Subject: [PATCH] [bitnami/drupal] Release 11.4.1-debian-12-r1 (#95411) Signed-off-by: Bitnami Bot --- bitnami/drupal/11/debian-12/Dockerfile | 6 ++--- ....4.1-0-linux-amd64-debian-12.tar.gz.sha256 | 1 - ....4.1-0-linux-arm64-debian-12.tar.gz.sha256 | 1 - ....4.1-1-linux-amd64-debian-12.tar.gz.sha256 | 1 + ....4.1-1-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../rootfs/opt/bitnami/scripts/libdrupal.sh | 22 +++++++++++++++++++ 6 files changed, 27 insertions(+), 5 deletions(-) delete mode 100644 bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/drupal/11/debian-12/Dockerfile b/bitnami/drupal/11/debian-12/Dockerfile index 5ef62a734d8f..99ae9fe19bbc 100644 --- a/bitnami/drupal/11/debian-12/Dockerfile +++ b/bitnami/drupal/11/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-07-09T19:58:31Z" \ + org.opencontainers.image.created="2026-07-10T17:15:17Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/drupal/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal" \ @@ -34,7 +34,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ "libphp-8.4.23-0-linux-${OS_ARCH}-debian-12" \ "postgresql-lib-18.4.0-0-linux-${OS_ARCH}-debian-12" \ "apache-2.4.68-3-linux-${OS_ARCH}-debian-12" \ - "drupal-11.4.1-0-linux-${OS_ARCH}-debian-12" \ + "drupal-11.4.1-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -61,7 +61,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="11.4.1" \ BITNAMI_APP_NAME="drupal" \ - IMAGE_REVISION="0" \ + IMAGE_REVISION="1" \ LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/apache/bin:/opt/bitnami/drupal/vendor/bin:$PATH" diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 31615f180996..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -8329fb66d85ebb7c95536a1fd875b7c4bf94d06f8fb214ec22267e26c9a2d7fa drupal-11.4.1-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 6e2e6de37c5f..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -2539d0bfe7a6c49845347b35832589633296622e9df434c454b84a1382e471c4 drupal-11.4.1-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..400389d6a8e4 --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +51b79c8cb2e819bc7e212ee9427916840e48ec0a673a041f3714952edfb0b825 drupal-11.4.1-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5762fe108693 --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.4.1-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +4b3c5e137d72999c32bb1589df1b9df3633d609ea8421d557df4e98cbe2a1d0f drupal-11.4.1-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh b/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh index 5d1e0711e335..5a1889ec9eff 100644 --- a/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh +++ b/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libdrupal.sh @@ -272,6 +272,19 @@ drupal_wait_for_db_connection() { fi } +######################## +# Get the installed Drupal core version +# Globals: +# DRUPAL_BASE_DIR +# Arguments: +# None +# Returns: +# String +######################### +drupal_get_version() { + grep -oE "const VERSION = '[0-9.]+'" "${DRUPAL_BASE_DIR}/core/lib/Drupal.php" | grep -oE '[0-9.]+' +} + ######################## # Drupal Site Install # Globals: @@ -306,6 +319,15 @@ drupal_site_install() { "-y" "$DRUPAL_PROFILE" ) + # Drupal core 11.4.0 removed the Article and Page content types from the "standard" + # install profile/recipe (drupal.org issue #3587118). Restore them via their own + # recipes on affected versions so sites keep the content types earlier Drupal + # versions provided by default. + if [[ "$DRUPAL_PROFILE" = "standard" ]] && [[ "$(compare_semantic_versions "$(drupal_get_version)" "11.4.0")" -ge 0 ]]; then + drush_execute recipe "core/recipes/article_content_type" "-y" + drush_execute recipe "core/recipes/page_content_type" "-y" + fi + # When Drupal settings are patched to allow SSL database connections, the database settings block is duplicated # after the installation with Drush is_empty_value "$DRUPAL_DATABASE_TLS_CA_FILE" || drupal_remove_duplicated_database_settings