[bitnami/drupal] Release 10.2.4-debian-12-r2 (#63884)

Signed-off-by: Bitnami Containers <[email protected]>
bitnami · Mar 18, 2024 · f229bc4 · f229bc4
1 parent a957945
commit f229bc4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/bitnami/drupal/10/debian-12/Dockerfile b/bitnami/drupal/10/debian-12/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-03-09T15:48:03Z" \
+      org.opencontainers.image.created="2024-03-18T19:28:23Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.2.4-debian-12-r1" \
+      org.opencontainers.image.ref.name="10.2.4-debian-12-r2" \
       org.opencontainers.image.title="drupal" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.2.4"
@@ -27,11 +27,11 @@ RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \
-      "php-8.2.16-2-linux-${OS_ARCH}-debian-12" \
+      "php-8.2.17-0-linux-${OS_ARCH}-debian-12" \
       "apache-2.4.58-8-linux-${OS_ARCH}-debian-12" \
       "mysql-client-11.2.3-1-linux-${OS_ARCH}-debian-12" \
-      "libphp-8.2.16-1-linux-${OS_ARCH}-debian-12" \
-      "drupal-10.2.4-1-linux-${OS_ARCH}-debian-12" \
+      "libphp-8.2.17-0-linux-${OS_ARCH}-debian-12" \
+      "drupal-10.2.4-3-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \

diff --git a/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,13 +9,13 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "10.2.4-1"
+        "version": "10.2.4-3"
     },
     "libphp": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.16-1"
+        "version": "8.2.17-0"
     },
     "mysql-client": {
         "arch": "amd64",
@@ -27,7 +27,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.16-2"
+        "version": "8.2.17-0"
     },
     "render-template": {
         "arch": "amd64",

diff --git a/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/drupal/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -48,6 +48,7 @@ print_image_welcome_page() {
     info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}"
     info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}"
     info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}"
+    info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}"
     info ""
 }
 
diff --git a/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf b/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf
@@ -1,5 +1,5 @@
 <IfModule mod_deflate.c>
-  AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+  AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
   AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
   AddOutputFilterByType DEFLATE application/rss+xml
 </IfModule>
diff --git a/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh b/bitnami/drupal/10/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh
@@ -37,3 +37,7 @@ AddType application/x-httpd-php .php
 DirectoryIndex index.html index.htm index.php
 EOF
 ensure_apache_configuration_exists "Include \"${apache_php_conf_file}\""
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "$APACHE_CONF_DIR"/* "$APACHE_DEFAULT_CONF_DIR"
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
@@ -223,7 +223,6 @@ docker run -d --name drupal \
 | `DRUPAL_VOLUME_DIR`            | Drupal directory for mounted configuration files.                                                                                | `${BITNAMI_VOLUME_DIR}/drupal`                  |
 | `DRUPAL_MOUNTED_CONF_FILE`     | Mounted configuration file for Drupal. It will be copied to the Drupal installation directory during the initialization process. | `${DRUPAL_VOLUME_DIR}/settings.php`             |
 | `DRUPAL_DEFAULT_DATABASE_HOST` | Default database server host.                                                                                                    | `mariadb`                                       |
-| `DRUPAL_DEFAULT_DATABASE_HOST` | Default database server host.                                                                                                    | `127.0.0.1`                                     |
 | `PHP_DEFAULT_MEMORY_LIMIT`     | Default PHP memory limit.                                                                                                        | `256M`                                          |
 
 When you start the Drupal image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: