From 8e71ae02dbf37eec3469e1877454a71c7d15aaf0 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 24 Feb 2022 20:23:18 +0000
Subject: [PATCH] 3.3.5-debian-10-r133 release

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

diff --git a/bitnami/phpbb/3/debian-10/Dockerfile b/bitnami/phpbb/3/debian-10/Dockerfile
index 58fb94254b60..ed45dfec1a41 100644
--- a/bitnami/phpbb/3/debian-10/Dockerfile
+++ b/bitnami/phpbb/3/debian-10/Dockerfile
@@ -29,7 +29,7 @@ RUN /opt/bitnami/scripts/phpbb/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpbb" \
-    BITNAMI_IMAGE_VERSION="3.3.5-debian-10-r132" \
+    BITNAMI_IMAGE_VERSION="3.3.5-debian-10-r133" \
     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/phpbb/3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1b504b1df458..21b964ff1cf4 100644
--- a/bitnami/phpbb/3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/phpbb/3/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/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index d16e036df0a4..9609635e63a3 100644
--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/phpbb/3/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/phpbb/README.md b/bitnami/phpbb/README.md
index 2603c26126e8..7ec05e2ba47a 100644
--- a/bitnami/phpbb/README.md
+++ b/bitnami/phpbb/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/).
 
 
-* [`3`, `3-debian-10`, `3.3.5`, `3.3.5-debian-10-r132`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.5-debian-10-r132/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.3.5`, `3.3.5-debian-10-r133`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.5-debian-10-r133/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpbb GitHub repo](https://github.com/bitnami/bitnami-docker-phpbb).