From 704206f935a450d9b5eb4b9773dbab5ff50d76bb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 24 Feb 2022 23:28:38 +0000
Subject: [PATCH] 5.9.1-debian-10-r2 release

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

diff --git a/bitnami/wordpress-nginx/5/debian-10/Dockerfile b/bitnami/wordpress-nginx/5/debian-10/Dockerfile
index f0332ae48b68..ef6d0adf109a 100644
--- a/bitnami/wordpress-nginx/5/debian-10/Dockerfile
+++ b/bitnami/wordpress-nginx/5/debian-10/Dockerfile
@@ -22,13 +22,13 @@ 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/nginx/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh
 RUN /opt/bitnami/scripts/wordpress/postunpack.sh
 RUN /opt/bitnami/scripts/wp-cli/postunpack.sh
 ENV BITNAMI_APP_NAME="wordpress-nginx" \
-    BITNAMI_IMAGE_VERSION="5.9.1-debian-10-r1" \
+    BITNAMI_IMAGE_VERSION="5.9.1-debian-10-r2" \
     NGINX_HTTPS_PORT_NUMBER="" \
     NGINX_HTTP_PORT_NUMBER="" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/wp-cli/bin:/opt/bitnami/nginx/sbin:/opt/bitnami/mysql/bin:$PATH"
diff --git a/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1b504b1df458..21b964ff1cf4 100644
--- a/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/wordpress-nginx/5/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/wordpress-nginx/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/wordpress-nginx/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index d16e036df0a4..9609635e63a3 100644
--- a/bitnami/wordpress-nginx/5/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/wordpress-nginx/5/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/wordpress-nginx/README.md b/bitnami/wordpress-nginx/README.md
index 13fd2ce3ff69..9d35e9ae07db 100644
--- a/bitnami/wordpress-nginx/README.md
+++ b/bitnami/wordpress-nginx/README.md
@@ -37,7 +37,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/).
 
 
-- [`5`, `5-debian-10`, `5.9.1`, `5.9.1-debian-10-r1`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/5.9.1-debian-10-r1/5/debian-10/Dockerfile)
+- [`5`, `5-debian-10`, `5.9.1`, `5.9.1-debian-10-r2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/5.9.1-debian-10-r2/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress-nginx).