From 9bd1251deb18a138c4b07be207e082cd3d36d78f Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 17 Feb 2021 07:00:17 +0000
Subject: [PATCH] 3.3.3-debian-10-r18 release

---
 bitnami/phpbb/3/debian-10/Dockerfile                  |  2 +-
 .../rootfs/opt/bitnami/scripts/apache-env.sh          | 11 +++++++++--
 .../rootfs/opt/bitnami/scripts/mysql-client-env.sh    | 11 +++++++++--
 .../3/debian-10/rootfs/opt/bitnami/scripts/php-env.sh | 11 +++++++++--
 .../debian-10/rootfs/opt/bitnami/scripts/phpbb-env.sh | 11 +++++++++--
 bitnami/phpbb/README.md                               |  2 +-
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/bitnami/phpbb/3/debian-10/Dockerfile b/bitnami/phpbb/3/debian-10/Dockerfile
index 871714d3d370..5515ebc6459e 100644
--- a/bitnami/phpbb/3/debian-10/Dockerfile
+++ b/bitnami/phpbb/3/debian-10/Dockerfile
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpbb" \
-    BITNAMI_IMAGE_VERSION="3.3.3-debian-10-r17" \
+    BITNAMI_IMAGE_VERSION="3.3.3-debian-10-r18" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
index ea3480702bb4..eec592498ecd 100644
--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
@@ -8,6 +8,9 @@
 # 3. Environment variables overridden via external files using *_FILE variables (see below)
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
+# Load logging library
+. /opt/bitnami/scripts/liblog.sh
+
 export BITNAMI_ROOT_DIR="/opt/bitnami"
 export BITNAMI_VOLUME_DIR="/bitnami"
 
@@ -26,8 +29,12 @@ apache_env_vars=(
 for env_var in "${apache_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
     if [[ -n "${!file_env_var:-}" ]]; then
-        export "${env_var}=$(< "${!file_env_var}")"
-        unset "${file_env_var}"
+        if [[ -r "${!file_env_var:-}" ]]; then
+            export "${env_var}=$(< "${!file_env_var}")"
+            unset "${file_env_var}"
+        else
+            warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable."
+        fi
     fi
 done
 unset apache_env_vars
diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
index ae42e8827305..de6600ffb0ed 100644
--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
@@ -8,6 +8,9 @@
 # 3. Environment variables overridden via external files using *_FILE variables (see below)
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
+# Load logging library
+. /opt/bitnami/scripts/liblog.sh
+
 export BITNAMI_ROOT_DIR="/opt/bitnami"
 export BITNAMI_VOLUME_DIR="/bitnami"
 
@@ -39,8 +42,12 @@ mysql_env_vars=(
 for env_var in "${mysql_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
     if [[ -n "${!file_env_var:-}" ]]; then
-        export "${env_var}=$(< "${!file_env_var}")"
-        unset "${file_env_var}"
+        if [[ -r "${!file_env_var:-}" ]]; then
+            export "${env_var}=$(< "${!file_env_var}")"
+            unset "${file_env_var}"
+        else
+            warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable."
+        fi
     fi
 done
 unset mysql_env_vars
diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index 9ff4e1d53912..bfa1c683afc8 100644
--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
@@ -8,6 +8,9 @@
 # 3. Environment variables overridden via external files using *_FILE variables (see below)
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
+# Load logging library
+. /opt/bitnami/scripts/liblog.sh
+
 export BITNAMI_ROOT_DIR="/opt/bitnami"
 export BITNAMI_VOLUME_DIR="/bitnami"
 
@@ -30,8 +33,12 @@ php_env_vars=(
 for env_var in "${php_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
     if [[ -n "${!file_env_var:-}" ]]; then
-        export "${env_var}=$(< "${!file_env_var}")"
-        unset "${file_env_var}"
+        if [[ -r "${!file_env_var:-}" ]]; then
+            export "${env_var}=$(< "${!file_env_var}")"
+            unset "${file_env_var}"
+        else
+            warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable."
+        fi
     fi
 done
 unset php_env_vars
diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/phpbb-env.sh b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/phpbb-env.sh
index 4cd7dc609e16..2aaec258073e 100644
--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/phpbb-env.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/phpbb-env.sh
@@ -8,6 +8,9 @@
 # 3. Environment variables overridden via external files using *_FILE variables (see below)
 # 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata)
 
+# Load logging library
+. /opt/bitnami/scripts/liblog.sh
+
 export BITNAMI_ROOT_DIR="/opt/bitnami"
 export BITNAMI_VOLUME_DIR="/bitnami"
 
@@ -51,8 +54,12 @@ phpbb_env_vars=(
 for env_var in "${phpbb_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
     if [[ -n "${!file_env_var:-}" ]]; then
-        export "${env_var}=$(< "${!file_env_var}")"
-        unset "${file_env_var}"
+        if [[ -r "${!file_env_var:-}" ]]; then
+            export "${env_var}=$(< "${!file_env_var}")"
+            unset "${file_env_var}"
+        else
+            warn "Skipping export of '${env_var}'. '${!file_env_var:-}' is not readable."
+        fi
     fi
 done
 unset phpbb_env_vars
diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md
index 5914cb024af1..d1a50d764ae2 100644
--- a/bitnami/phpbb/README.md
+++ b/bitnami/phpbb/README.md
@@ -42,7 +42,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.3`, `3.3.3-debian-10-r17`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.3-debian-10-r17/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.3.3`, `3.3.3-debian-10-r18`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.3-debian-10-r18/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpbb GitHub repo](https://github.com/bitnami/bitnami-docker-phpbb).