From a7e33c74de9d54685cd02c00e0bfcc6bb4b19ce8 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 8 Mar 2023 23:47:02 +0100
Subject: [PATCH] [bitnami/suitecrm] Release 8.2.4-debian-11-r2 (#26767)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/suitecrm/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/suitecrm/8/debian-11/Dockerfile b/bitnami/suitecrm/8/debian-11/Dockerfile
index 71aeb12d4f32..ead2763436cf 100644
--- a/bitnami/suitecrm/8/debian-11/Dockerfile
+++ b/bitnami/suitecrm/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-05T21:03:25Z" \
+      org.opencontainers.image.created="2023-03-08T21:48:23Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.2.4-debian-11-r1" \
+      org.opencontainers.image.ref.name="8.2.4-debian-11-r2" \
       org.opencontainers.image.title="suitecrm" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.2.4"
@@ -23,9 +23,9 @@ RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "php-8.1.16-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.1.16-2-linux-${OS_ARCH}-debian-11" \
+      "libphp-8.1.16-3-linux-${OS_ARCH}-debian-11" \
       "suitecrm-8.2.4-0-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" \
diff --git a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 07e3d9794948..9cb5d775177d 100644
--- a/bitnami/suitecrm/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/suitecrm/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": "1d7b74f430c9e304a843fe6e1e810cae70a98485556b6730bcdab10dc190cedb",
+        "digest": "6556a2340a5156847b4526d9da53c875d2a95760d0681bdcff814a2686f71842",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.1.16-2"
+        "version": "8.1.16-3"
     },
     "mysql-client": {
         "arch": "amd64",
diff --git a/bitnami/suitecrm/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/suitecrm/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index e75380bf4ec2..56ce1b553f7b 100644
--- a/bitnami/suitecrm/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/suitecrm/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
 }