From 8e4bb4bbbd2bf4f2187da238618649d4fdb846f0 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 25 Feb 2022 05:36:58 +0000
Subject: [PATCH] 1.7.8-3-debian-10-r25 release

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

diff --git a/bitnami/prestashop/1.7/debian-10/Dockerfile b/bitnami/prestashop/1.7/debian-10/Dockerfile
index f1eafc1e86a2..62473d30715b 100644
--- a/bitnami/prestashop/1.7/debian-10/Dockerfile
+++ b/bitnami/prestashop/1.7/debian-10/Dockerfile
@@ -22,14 +22,14 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/prestashop/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="prestashop" \
-    BITNAMI_IMAGE_VERSION="1.7.8-3-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="1.7.8-3-debian-10-r25" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/prestashop/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/prestashop/1.7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/prestashop/1.7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1b504b1df458..21b964ff1cf4 100644
--- a/bitnami/prestashop/1.7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/prestashop/1.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/prestashop/1.7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/prestashop/1.7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index d16e036df0a4..9609635e63a3 100644
--- a/bitnami/prestashop/1.7/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/prestashop/1.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/prestashop/README.md b/bitnami/prestashop/README.md
index 14cf91701bf7..21d9f6ca4731 100644
--- a/bitnami/prestashop/README.md
+++ b/bitnami/prestashop/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`1.7`, `1.7-debian-10`, `1.7.8-3`, `1.7.8-3-debian-10-r24`, `latest` (1.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-prestashop/blob/1.7.8-3-debian-10-r24/1.7/debian-10/Dockerfile)
+* [`1.7`, `1.7-debian-10`, `1.7.8-3`, `1.7.8-3-debian-10-r25`, `latest` (1.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-prestashop/blob/1.7.8-3-debian-10-r25/1.7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/prestashop GitHub repo](https://github.com/bitnami/bitnami-docker-prestashop).