From de413292fd26de074ceb03c2495fe029261103cf Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 24 Feb 2022 21:46:08 +0000
Subject: [PATCH] 7.12.4-debian-10-r12 release

---
 bitnami/suitecrm/7/debian-10/Dockerfile                  | 4 ++--
 .../7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh  | 5 +++--
 .../rootfs/opt/bitnami/scripts/libmysqlclient.sh         | 9 +++++++--
 bitnami/suitecrm/README.md                               | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bitnami/suitecrm/7/debian-10/Dockerfile b/bitnami/suitecrm/7/debian-10/Dockerfile
index 4fa01db0eb7e..2c3dabb72595 100644
--- a/bitnami/suitecrm/7/debian-10/Dockerfile
+++ b/bitnami/suitecrm/7/debian-10/Dockerfile
@@ -23,14 +23,14 @@ RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/suitecrm/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="suitecrm" \
-    BITNAMI_IMAGE_VERSION="7.12.4-debian-10-r11" \
+    BITNAMI_IMAGE_VERSION="7.12.4-debian-10-r12" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/suitecrm/7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/suitecrm/7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1b504b1df458..21b964ff1cf4 100644
--- a/bitnami/suitecrm/7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/suitecrm/7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -74,8 +74,9 @@ is_dir_empty() {
 #   boolean
 #########################
 is_mounted_dir_empty() {
-    local dir="${1:?missing directory}"
-
+    local -r path="${1:?missing directory}"
+    # Calculate real path in order to avoid issues with symlinks
+    local -r dir="$(realpath "$path")"
     if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then
         true
     else
diff --git a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index d16e036df0a4..9609635e63a3 100644
--- a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -929,12 +929,17 @@ mysql_conf_set() {
     local -r key="${1:?key missing}"
     local -r value="${2:?value missing}"
     read -r -a sections <<<"${3:-mysqld}"
-    local -r file="${4:-"$DB_CONF_FILE"}"
+    local -r ignore_inline_comments="${4:-no}"
+    local -r file="${5:-"$DB_CONF_FILE"}"
     info "Setting ${key} option"
     debug "Setting ${key} to '${value}' in ${DB_FLAVOR} configuration file ${file}"
     # Check if the configuration exists in the file
     for section in "${sections[@]}"; do
-        ini-file set --section "$section" --key "$key" --value "$value" "$file"
+        if is_boolean_yes "$ignore_inline_comments"; then
+            ini-file set --ignore-inline-comments --section "$section" --key "$key" --value "$value" "$file"
+        else
+            ini-file set --section "$section" --key "$key" --value "$value" "$file"
+        fi
     done
 }
 
diff --git a/bitnami/suitecrm/README.md b/bitnami/suitecrm/README.md
index 68ab1049c21f..2b61cabc49ea 100644
--- a/bitnami/suitecrm/README.md
+++ b/bitnami/suitecrm/README.md
@@ -39,7 +39,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) 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/).
 
 
-* [`7`, `7-debian-10`, `7.12.4`, `7.12.4-debian-10-r11`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.12.4-debian-10-r11/7/debian-10/Dockerfile)
+* [`7`, `7-debian-10`, `7.12.4`, `7.12.4-debian-10-r12`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.12.4-debian-10-r12/7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/suitecrm GitHub repo](https://github.com/bitnami/bitnami-docker-suitecrm).