From cd0496329dc81d69205708bcddc6d56d36ac5557 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Mon, 6 Mar 2023 19:20:18 +0100
Subject: [PATCH] [bitnami/drupal] Release 9.5.4-debian-11-r2 (#26471)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/drupal/9/debian-11/Dockerfile                       | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json         | 4 ++--
 .../debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bitnami/drupal/9/debian-11/Dockerfile b/bitnami/drupal/9/debian-11/Dockerfile
index c4b7a7f23409..13fbf321b3a9 100644
--- a/bitnami/drupal/9/debian-11/Dockerfile
+++ b/bitnami/drupal/9/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-04T18:26:33Z" \
+      org.opencontainers.image.created="2023-03-06T17:24:06Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.5.4-debian-11-r1" \
+      org.opencontainers.image.ref.name="9.5.4-debian-11-r2" \
       org.opencontainers.image.title="drupal" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.5.4"
@@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "libphp-8.1.16-2-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
-      "drupal-9.5.4-0-linux-${OS_ARCH}-debian-11" \
+      "drupal-9.5.4-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
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 d854c72d4cf5..a6f3f9ccdd45 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": "abf85975119d0059690af4d99a414cfd262192a7f46932f603d949afd2479ccb",
+        "digest": "91e0a4fdb642f58b723c9fa2f3723ea7fe542dc93d9e786ab67c2944d95abb86",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "9.5.4-0"
+        "version": "9.5.4-1"
     },
     "gosu": {
         "arch": "amd64",
diff --git a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index e75380bf4ec2..56ce1b553f7b 100644
--- a/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/drupal/9/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -488,7 +488,7 @@ mysql_upgrade() {
     else
         mysql_start_bg
         is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)")
-        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" --force
+        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded"
     fi
 }