From 587fa922f8da54ae65fde11972d3f178d719f1e4 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 19 Jun 2025 04:16:28 +0200 Subject: [PATCH] [bitnami/drupal] Release 11.2.0-debian-12-r0 (#82482) Signed-off-by: Bitnami Bot --- bitnami/drupal/11/debian-12/Dockerfile | 14 +++++------ .../opt/bitnami/.bitnami_components.json | 6 ++--- .../opt/bitnami/scripts/libmysqlclient.sh | 23 ++++++++++++++++--- bitnami/drupal/11/debian-12/tags-info.yaml | 2 +- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/bitnami/drupal/11/debian-12/Dockerfile b/bitnami/drupal/11/debian-12/Dockerfile index 4608c2887a09..7b5425b31fcd 100644 --- a/bitnami/drupal/11/debian-12/Dockerfile +++ b/bitnami/drupal/11/debian-12/Dockerfile @@ -8,14 +8,14 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-06-06T01:07:14Z" \ + org.opencontainers.image.created="2025-06-19T01:50:26Z" \ 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.ref.name="11.1.8-debian-12-r0" \ + org.opencontainers.image.ref.name="11.2.0-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal" \ org.opencontainers.image.title="drupal" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="11.1.8" + org.opencontainers.image.version="11.2.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -28,12 +28,12 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi8 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhashkit2 libhogweed6 libicu72 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.5-0 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl3 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp7 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 libzstd1 openssl procps unzip zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "render-template-1.0.7-17-linux-${OS_ARCH}-debian-12" \ - "php-8.3.22-0-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.8-0-linux-${OS_ARCH}-debian-12" \ + "php-8.3.22-4-linux-${OS_ARCH}-debian-12" \ "mysql-client-11.4.7-0-linux-${OS_ARCH}-debian-12" \ "libphp-8.3.22-0-linux-${OS_ARCH}-debian-12" \ "apache-2.4.63-5-linux-${OS_ARCH}-debian-12" \ - "drupal-11.1.8-0-linux-${OS_ARCH}-debian-12" \ + "drupal-11.2.0-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -58,7 +58,7 @@ RUN /opt/bitnami/scripts/drupal/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="11.1.8" \ + APP_VERSION="11.2.0" \ BITNAMI_APP_NAME="drupal" \ 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/.bitnami_components.json b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 475327cd855f..06419f25c47d 100644 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,7 +9,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "11.1.8-0" + "version": "11.2.0-0" }, "libphp": { "arch": "amd64", @@ -27,12 +27,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "8.3.22-0" + "version": "8.3.22-4" }, "render-template": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-17" + "version": "1.0.8-0" } } \ No newline at end of file diff --git a/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh index c702d828bc84..c096f4d1e1c1 100644 --- a/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/drupal/11/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -158,6 +158,23 @@ EOF # # Library for mysql common +######################## +# Returns the path to the MySQL/MariaDB binary +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# Path to the MySQL/MariaDB binary +######################### +mysql_binary() { + if [[ "${DB_FLAVOR:-mysql}" = "mariadb" ]]; then + echo "${DB_BIN_DIR}/mariadb" + else + echo "${DB_BIN_DIR}/mysql" + fi +} + ######################## # Extract mysql version from version string # Globals: @@ -171,7 +188,7 @@ mysql_get_version() { local ver_string local -a ver_split - ver_string=$("${DB_BIN_DIR}/mysql" "--version") + ver_string=$("$(mysql_binary)" "--version") read -r -a ver_split <<< "$ver_string" if [[ "$ver_string" = *" Distrib "* ]]; then @@ -255,11 +272,11 @@ mysql_execute_print_output() { local mysql_cmd mysql_cmd="$(