From 7f0cc71f20338fd1dbb5f2eca31927c7d6b10d85 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 24 Feb 2022 23:38:23 +0000
Subject: [PATCH] 1.37.1-debian-10-r67 release

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

diff --git a/bitnami/mediawiki/1/debian-10/Dockerfile b/bitnami/mediawiki/1/debian-10/Dockerfile
index 0165cb0527a5..76cc180633f1 100644
--- a/bitnami/mediawiki/1/debian-10/Dockerfile
+++ b/bitnami/mediawiki/1/debian-10/Dockerfile
@@ -25,15 +25,15 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.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/mediawiki/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="mediawiki" \
-    BITNAMI_IMAGE_VERSION="1.37.1-debian-10-r66" \
+    BITNAMI_IMAGE_VERSION="1.37.1-debian-10-r67" \
     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/mediawiki/1/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/mediawiki/1/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1b504b1df458..21b964ff1cf4 100644
--- a/bitnami/mediawiki/1/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/mediawiki/1/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/mediawiki/1/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/mediawiki/1/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index d16e036df0a4..9609635e63a3 100644
--- a/bitnami/mediawiki/1/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/mediawiki/1/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/mediawiki/README.md b/bitnami/mediawiki/README.md
index 8ce2fe955bb2..dc53ea577bd8 100644
--- a/bitnami/mediawiki/README.md
+++ b/bitnami/mediawiki/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`, `1-debian-10`, `1.37.1`, `1.37.1-debian-10-r66`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mediawiki/blob/1.37.1-debian-10-r66/1/debian-10/Dockerfile)
+* [`1`, `1-debian-10`, `1.37.1`, `1.37.1-debian-10-r67`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mediawiki/blob/1.37.1-debian-10-r67/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mediawiki GitHub repo](https://github.com/bitnami/bitnami-docker-mediawiki).