diff --git a/bitnami/drupal/11/debian-12/Dockerfile b/bitnami/drupal/11/debian-12/Dockerfile index 0588fb048546..dc89eb39be38 100644 --- a/bitnami/drupal/11/debian-12/Dockerfile +++ b/bitnami/drupal/11/debian-12/Dockerfile @@ -3,11 +3,11 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +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-06-04T14:37:40Z" \ + org.opencontainers.image.created="2026-06-10T12:33:13Z" \ 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" \ @@ -29,16 +29,16 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "render-template-1.0.9-166-linux-${OS_ARCH}-debian-12" \ - "php-8.4.21-5-linux-${OS_ARCH}-debian-12" \ + "php-8.4.22-1-linux-${OS_ARCH}-debian-12" \ "mysql-client-12.3.2-0-linux-${OS_ARCH}-debian-12" \ - "libphp-8.4.21-0-linux-${OS_ARCH}-debian-12" \ + "libphp-8.4.22-1-linux-${OS_ARCH}-debian-12" \ "postgresql-lib-18.4.0-0-linux-${OS_ARCH}-debian-12" \ - "apache-2.4.67-1-linux-${OS_ARCH}-debian-12" \ - "drupal-11.3.11-0-linux-${OS_ARCH}-debian-12" \ + "apache-2.4.68-0-linux-${OS_ARCH}-debian-12" \ + "drupal-11.3.11-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ fi ; \ sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ @@ -61,7 +61,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="11.3.11" \ BITNAMI_APP_NAME="drupal" \ - IMAGE_REVISION="3" \ + IMAGE_REVISION="4" \ 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/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index ffe4d71f0d07..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -cc9ec4ed758ad8502b7057aa3527cc003261038cd75f0a5fa8aa885bfea46ff1 apache-2.4.67-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 06e58dbe1e02..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.67-1-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -01aa3fe1d54b7ecde2e19098de2fe93205c1c105ff31391f98f5afc3274aa99e apache-2.4.67-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e81bfa8e0de3 --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +98a1e56f30bbbd9d51655a18f0854c7180ff0ad0ce8b44d2eaeefa12844f9f02 apache-2.4.68-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..fb2364acd31a --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +1ad93386933cac367d4f6380344996c1a774e817caa8463b298d102eef2bf243 apache-2.4.68-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index fe4d040ebd64..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -5e9fdcfb294dfc33c0df522ce3368c7a056be249b558b2c6bf454b4d7e0b30e8 drupal-11.3.11-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 8afc26b983be..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -d5f8214eb1fbba61b066ac4f1ccae5007971c7ba2155882a35bcc67769043b60 drupal-11.3.11-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..9b601dd18135 --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +cf2112833ba5bc20c67f076ad24d46fbdd87b65d7768000b57834cef93bd9fd4 drupal-11.3.11-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..a12df91d4753 --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/drupal-11.3.11-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +1e73c197bf4dc8ee44d52bf9ce3f28faaa5711b2a081d5a709ee264be8499cbc drupal-11.3.11-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 9e20f02d08b0..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -1c0534f33b21dc6b1754967226d002345b0461f94601a55006b91441136c240f libphp-8.4.21-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 3645c6b66d95..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.21-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -949e96622f83b03c9abfdd23c4d45fefb96cbecde83a6315d8d556806a2d3e4a libphp-8.4.21-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..bbe36d2f78dd --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +a64a1cb062f7bdb9ea94bfd0f79d65685d98f22342b2ecfd0e231b183b605000 libphp-8.4.22-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e3ce1c15b2b9 --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +e774c534daba5c95201b8e57a6e13e8750b02bafbc8bdfec3d7ef59b520e647a libphp-8.4.22-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index e6b37c12a0ea..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -101267a9e206d18be90a2bd1fc383a168359c96e1db7f7383d31a7366f1137fd php-8.4.21-5-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index f18b6e839e8d..000000000000 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.21-5-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -73d961f31f79364d8c10385e3f2a918fc5b7e8bb4150cbdf11063a1ed60fde9a php-8.4.21-5-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..8826fc85a20d --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +fa6a2f744c04fd308f9ce78cae7dc097fd5de6896ab94144fce2d5bf1b33f2ac php-8.4.22-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..ee49932bb258 --- /dev/null +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +03d2ae1bb27a1385e619261fe7a757be2b4be99335aa0673c3907d668da09e67 php-8.4.22-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/drupal/11/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +} 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 97ab588065ce..2fce29970c1a 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 @@ -1017,6 +1017,17 @@ mysql_client_flavor() { fi } +# Helper to get the proper value for the MySQL client environment variable +mysql_client_env_value() { + local env_name="MYSQL_CLIENT_${1:?missing name}" + if [[ -n "${!env_name:-}" ]]; then + echo "${!env_name:-}" + else + env_name="DB_CLIENT_${1}" + echo "${!env_name:-}" + fi +} + ######################## # Prints extra options for MySQL client calls (i.e. SSL options) # Globals: @@ -1027,16 +1038,6 @@ mysql_client_flavor() { # List of options to pass to "mysql" CLI ######################### mysql_client_extra_opts() { - # Helper to get the proper value for the MySQL client environment variable - mysql_client_env_value() { - local env_name="MYSQL_CLIENT_${1:?missing name}" - if [[ -n "${!env_name:-}" ]]; then - echo "${!env_name:-}" - else - env_name="DB_CLIENT_${1}" - echo "${!env_name:-}" - fi - } local -a opts=() local key value if is_boolean_yes "${DB_ENABLE_SSL:-no}"; then