From b787c7fb144258fe4a0fada5ebad4305dc9506f3 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 20 Sep 2022 19:51:33 +0200
Subject: [PATCH] [bitnami/drupal] Release 9.4.6-debian-11-r0 (#7200)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/drupal/9/debian-11/Dockerfile         | 56 +++++++++----------
 .../opt/bitnami/.bitnami_components.json      | 16 +++---
 .../prebuildfs/opt/bitnami/scripts/libos.sh   | 55 ++++++++++++++++++
 .../prebuildfs/usr/sbin/install_packages      |  9 +--
 bitnami/drupal/9/debian-11/tags-info.yaml     |  2 +-
 bitnami/drupal/README.md                      |  2 +-
 6 files changed, 98 insertions(+), 42 deletions(-)

diff --git a/bitnami/drupal/9/debian-11/Dockerfile b/bitnami/drupal/9/debian-11/Dockerfile
index 2902d4cc10ad..99bd6d3fc865 100644
--- a/bitnami/drupal/9/debian-11/Dockerfile
+++ b/bitnami/drupal/9/debian-11/Dockerfile
@@ -4,11 +4,11 @@ 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.5-debian-11-r11" \
+      org.opencontainers.image.ref.name="9.4.6-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/drupal" \
       org.opencontainers.image.title="drupal" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="9.4.5"
+      org.opencontainers.image.version="9.4.6"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -20,13 +20,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gnupg gzip libaudit1 libbrotli1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 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 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar unzip zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f php-8.1.10-3-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-8.1.10-3-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-8.1.10-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
+    if [ ! -f php-8.1.10-4-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-8.1.10-4-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-8.1.10-4-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    sha256sum -c php-8.1.10-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf php-8.1.10-3-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf php-8.1.10-3-linux-${OS_ARCH}-debian-11.tar.gz php-8.1.10-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    sha256sum -c php-8.1.10-4-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf php-8.1.10-4-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf php-8.1.10-4-linux-${OS_ARCH}-debian-11.tar.gz php-8.1.10-4-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     if [ ! -f apache-2.4.54-156-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
       curl -SsLf https://downloads.bitnami.com/files/stacksmith/apache-2.4.54-156-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
@@ -36,21 +36,21 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     tar -zxf apache-2.4.54-156-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
     rm -rf apache-2.4.54-156-linux-${OS_ARCH}-debian-11.tar.gz apache-2.4.54-156-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
+    if [ ! -f mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    sha256sum -c mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    sha256sum -c mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f libphp-8.1.10-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/libphp-8.1.10-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/libphp-8.1.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
+    if [ ! -f libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    sha256sum -c libphp-8.1.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf libphp-8.1.10-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf libphp-8.1.10-0-linux-${OS_ARCH}-debian-11.tar.gz libphp-8.1.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    sha256sum -c libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     if [ ! -f render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
       curl -SsLf https://downloads.bitnami.com/files/stacksmith/render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
@@ -68,15 +68,15 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
     rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f drupal-9.4.5-3-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/drupal-9.4.5-3-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/drupal-9.4.5-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
+    if [ ! -f drupal-9.4.6-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/drupal-9.4.6-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/drupal-9.4.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    sha256sum -c drupal-9.4.5-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf drupal-9.4.5-3-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf drupal-9.4.5-3-linux-${OS_ARCH}-debian-11.tar.gz drupal-9.4.5-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    sha256sum -c drupal-9.4.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf drupal-9.4.6-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf drupal-9.4.6-0-linux-${OS_ARCH}-debian-11.tar.gz drupal-9.4.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN apt-get update && apt-get upgrade -y && \
-    rm -r /var/lib/apt/lists /var/cache/apt/archives
+    apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
@@ -87,7 +87,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="9.4.5" \
+    APP_VERSION="9.4.6" \
     BITNAMI_APP_NAME="drupal" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/drupal/vendor/bin:$PATH"
 
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 4cd55f2cf50c..14912e59ceb7 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
@@ -8,10 +8,10 @@
     },
     "drupal": {
         "arch": "amd64",
-        "digest": "f5447afcd46344a67397ca87aa8dfab9ae2b79693433781731e2c19e1fcc332e",
+        "digest": "71d63160a485bb2b0b2b82de8f0fa5aef3e60539192b711196f51fc297534a2a",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "9.4.5-3"
+        "version": "9.4.6-0"
     },
     "gosu": {
         "arch": "amd64",
@@ -22,24 +22,24 @@
     },
     "libphp": {
         "arch": "amd64",
-        "digest": "711e814d64b1721d24fee5fd4a93cf93465b28948b76937d1a46e12b0003f891",
+        "digest": "e8cbf104805c5e49f1832592a12d9ba1bb6a2f842db9c43c3a1f544636dcac21",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.1.10-0"
+        "version": "8.1.10-1"
     },
     "mysql-client": {
         "arch": "amd64",
-        "digest": "14ae2f6d8d5f4e3a9e4cf62d5a3da80587a20651a5920dbc4ac89afdaf06f8c0",
+        "digest": "8a1d2ee97e1e6b337254b886f99392ea181cc1708965212e776b205dd61731a2",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "10.6.9-1"
+        "version": "10.6.10-0"
     },
     "php": {
         "arch": "amd64",
-        "digest": "85f05dc1863afe261eb54641c9eea5a6507a216889902fa45ca9b88de78878f7",
+        "digest": "492f64cf20f238101ef7f9edf6e3840b7833aac3c526576c0994b7d43f8e4efd",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.1.10-3"
+        "version": "8.1.10-4"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 08b1d4884c28..92530b32d94d 100644
--- a/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/drupal/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -197,6 +197,8 @@ am_i_root() {
 #   --version - Distro version
 #   --branch - Distro branch
 #   --codename - Distro codename
+#   --name - Distro name
+#   --pretty-name - Distro pretty name
 # Returns:
 #   String
 #########################
@@ -223,6 +225,12 @@ get_os_metadata() {
     --codename)
         get_os_release_metadata VERSION_CODENAME
         ;;
+    --name)
+        get_os_release_metadata NAME
+        ;;
+    --pretty-name)
+        get_os_release_metadata PRETTY_NAME
+        ;;
     *)
         error "Unknown flag ${flag_name}"
         return 1
@@ -498,3 +506,50 @@ get_machine_id() {
     fi
     echo "$machine_id"
 }
+
+########################
+# Get the root partition's disk device ID (e.g. /dev/sda1)
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   Root partition disk ID
+#########################
+get_disk_device_id() {
+    local device_id=""
+    if grep -q ^/dev /proc/mounts; then
+        device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
+    fi
+    # If it could not be autodetected, fallback to /dev/sda1 as a default
+    if [[ -z "$device_id" || ! -b "$device_id" ]]; then
+        device_id="/dev/sda1"
+    fi
+    echo "$device_id"
+}
+
+########################
+# Get the root disk device ID (e.g. /dev/sda)
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   Root disk ID
+#########################
+get_root_disk_device_id() {
+    get_disk_device_id | sed 's/[0-9]\+$//'
+}
+
+########################
+# Get the root disk size in bytes
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   Root disk size in bytes
+#########################
+get_root_disk_size() {
+    fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
+}
diff --git a/bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/install_packages
index c9577647443b..77857a1a57f2 100755
--- a/bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/drupal/9/debian-11/prebuildfs/usr/sbin/install_packages
@@ -1,9 +1,10 @@
 #!/bin/sh
-set -e
-set -u
-export DEBIAN_FRONTEND=noninteractive
+set -eu
+
 n=0
 max=2
+export DEBIAN_FRONTEND=noninteractive
+
 until [ $n -gt $max ]; do
     set +e
     (
@@ -21,4 +22,4 @@ until [ $n -gt $max ]; do
     echo "apt failed, retrying"
     n=$(($n + 1))
 done
-rm -r /var/lib/apt/lists /var/cache/apt/archives
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/drupal/9/debian-11/tags-info.yaml b/bitnami/drupal/9/debian-11/tags-info.yaml
index 3e39ad85d6b0..af82d1749f01 100644
--- a/bitnami/drupal/9/debian-11/tags-info.yaml
+++ b/bitnami/drupal/9/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
   - "9"
   - "9-debian-11"
-  - "9.4.5"
+  - "9.4.6"
   - "latest"
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 95dba959c0cd..c6e5cba63d2b 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -41,7 +41,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`9`, `9-debian-11`, `9.4.5`, `9.4.5-debian-11-r11`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/drupal/9/debian-11/Dockerfile)
+* [`9`, `9-debian-11`, `9.4.6`, `9.4.6-debian-11-r0`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/drupal/9/debian-11/Dockerfile)
 * [`7`, `7-debian-11`, `7.92.0`, `7.92.0-debian-11-r7` (7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/drupal/7/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).