From b443282c0cc7aa34c49491b0f7010fc042ad6039 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 8 Mar 2023 02:30:36 +0100
Subject: [PATCH] [bitnami/osclass] Release 8.1.1-debian-11-r7 (#26660)

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

diff --git a/bitnami/osclass/8/debian-11/Dockerfile b/bitnami/osclass/8/debian-11/Dockerfile
index 24d27155438e..ffffa36f354a 100644
--- a/bitnami/osclass/8/debian-11/Dockerfile
+++ b/bitnami/osclass/8/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-05T00:27:14Z" \
+      org.opencontainers.image.created="2023-03-08T00:57:28Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.1.1-debian-11-r6" \
+      org.opencontainers.image.ref.name="8.1.1-debian-11-r7" \
       org.opencontainers.image.title="osclass" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.1.1"
@@ -23,9 +23,9 @@ RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "php-8.0.28-2-linux-${OS_ARCH}-debian-11" \
-      "apache-2.4.55-6-linux-${OS_ARCH}-debian-11" \
+      "apache-2.4.56-0-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \
-      "libphp-8.0.28-2-linux-${OS_ARCH}-debian-11" \
+      "libphp-8.0.28-3-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \
       "osclass-8.1.1-1-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 59ff063d642f..6ef896fab069 100644
--- a/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/osclass/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,10 +1,10 @@
 {
     "apache": {
         "arch": "amd64",
-        "digest": "85cad262b1568f5c507335dea52c7b311b157f15db13e88c4272a93410009abf",
+        "digest": "d03822c8f55162804b116a8d1753545a39faed5de86139ea775aefbd63252510",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.4.55-6"
+        "version": "2.4.56-0"
     },
     "gosu": {
         "arch": "amd64",
@@ -15,10 +15,10 @@
     },
     "libphp": {
         "arch": "amd64",
-        "digest": "975e5e7663ae11b6b0f34ed8a589a5beb9589c0628f23890421a92143d9dfacc",
+        "digest": "722d7b694c1bb91c8fa05b5ba8e837215f14aef38c24975ca10f473265afa20f",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.0.28-2"
+        "version": "8.0.28-3"
     },
     "mysql-client": {
         "arch": "amd64",
diff --git a/bitnami/osclass/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/osclass/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index e75380bf4ec2..56ce1b553f7b 100644
--- a/bitnami/osclass/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/osclass/8/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
 }