From d088560cbd67fdd9e0fc278cac3b5fc2a8a33161 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 23 Jun 2020 09:53:38 +0000
Subject: [PATCH] 3.3.0-debian-10-r147 release

---
 bitnami/phpbb/3/debian-10/Dockerfile          |  2 +-
 .../3/debian-10/rootfs/post-init.d/php.sh     | 32 ++++++++----
 .../3/debian-10/rootfs/post-init.d/shell.sh   | 43 ++++++++++------
 .../debian-10/rootfs/post-init.d/sql-mysql.sh | 51 ++++++++++++-------
 bitnami/phpbb/3/debian-10/rootfs/post-init.sh | 24 ++++++---
 bitnami/phpbb/README.md                       |  2 +-
 6 files changed, 101 insertions(+), 53 deletions(-)
 mode change 100644 => 100755 bitnami/phpbb/3/debian-10/rootfs/post-init.sh

diff --git a/bitnami/phpbb/3/debian-10/Dockerfile b/bitnami/phpbb/3/debian-10/Dockerfile
index 287a8718c4f3..24db4567f8f7 100644
--- a/bitnami/phpbb/3/debian-10/Dockerfile
+++ b/bitnami/phpbb/3/debian-10/Dockerfile
@@ -26,7 +26,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="phpbb" \
-    BITNAMI_IMAGE_VERSION="3.3.0-debian-10-r146" \
+    BITNAMI_IMAGE_VERSION="3.3.0-debian-10-r147" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpbb/3/debian-10/rootfs/post-init.d/php.sh b/bitnami/phpbb/3/debian-10/rootfs/post-init.d/php.sh
index fb44050dece0..8d76ab8913c9 100755
--- a/bitnami/phpbb/3/debian-10/rootfs/post-init.d/php.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/post-init.d/php.sh
@@ -1,21 +1,31 @@
 #!/bin/bash
 #
-# Post-init script to execute PHP files
+# Executes custom PHP init scripts
 
 # shellcheck disable=SC1091
 
+set -o errexit
+set -o nounset
+set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purposes
 
-. /opt/bitnami/base/functions
+# Load libraries with logging functions
+if [[ -f /opt/bitnami/base/functions ]]; then
+    . /opt/bitnami/base/functions
+else
+    . /opt/bitnami/scripts/liblog.sh
+fi
 
-readonly f="${1:?missing PHP file}"
+# Loop through all input files passed via stdin
+read -r -a custom_init_scripts <<< "$@"
 failure=0
+if [[ "${#custom_init_scripts[@]}" -gt 0 ]]; then
+    for custom_init_script in "${custom_init_scripts[@]}"; do
+        [[ "$custom_init_script" != *".php" ]] && continue
+        info "Executing ${custom_init_script} with PHP interpreter"
+        php "$custom_init_script" || failure=1
+        [[ "$failure" -ne 0 ]] && error "Failed to execute ${custom_init_script}"
+    done
+fi
 
-if [[ "$f" == *".php" ]]; then
-    info "Executing $f with PHP interpreter"
-    php "$f" || failure=$?
-fi
-if [[ "$failure" -ne 0 ]]; then
-    error "Failed to execute ${f}"
-    exit "$failure"
-fi
+exit "$failure"
diff --git a/bitnami/phpbb/3/debian-10/rootfs/post-init.d/shell.sh b/bitnami/phpbb/3/debian-10/rootfs/post-init.d/shell.sh
index e03122ff6f3a..665152ba8b6f 100755
--- a/bitnami/phpbb/3/debian-10/rootfs/post-init.d/shell.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/post-init.d/shell.sh
@@ -1,24 +1,37 @@
 #!/bin/bash
 #
-# Post-init script to execute Shell files
+# Executes custom Bash init scripts
 
-# shellcheck disable=SC1090,SC1091
+# shellcheck disable=SC1090
+# shellcheck disable=SC1091
 
+set -o errexit
+set -o nounset
+set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purposes
 
-. /opt/bitnami/base/functions
+# Load libraries with logging functions
+if [[ -f /opt/bitnami/base/functions ]]; then
+    . /opt/bitnami/base/functions
+else
+    . /opt/bitnami/scripts/liblog.sh
+fi
 
-readonly f="${1:?missing SHELL file}"
+# Loop through all input files passed via stdin
+read -r -a custom_init_scripts <<< "$@"
 failure=0
+if [[ "${#custom_init_scripts[@]}" -gt 0 ]]; then
+    for custom_init_script in "${custom_init_scripts[@]}"; do
+        [[ "$custom_init_script" != *".sh" ]] && continue
+        if [[ -x "$custom_init_script" ]]; then
+            info "Executing ${custom_init_script}"
+            "$custom_init_script" || failure="1"
+        else
+            info "Sourcing ${custom_init_script} as it is not executable by the current user, any error may cause initialization to fail"
+            . "$custom_init_script"
+        fi
+        [[ "$failure" -ne 0 ]] && error "Failed to execute ${custom_init_script}"
+    done
+fi
 
-if [[ "$f" == *".sh" ]]; then
-    if [[ -x "$f" ]]; then
-        info "Executing $f"; "$f" || failure=$?
-    else
-        info "Sourcing $f"; . "$f"
-    fi
-fi
-if [[ "$failure" -ne 0 ]]; then
-    error "Failed to execute ${f}"
-    exit "$failure"
-fi
+exit "$failure"
diff --git a/bitnami/phpbb/3/debian-10/rootfs/post-init.d/sql-mysql.sh b/bitnami/phpbb/3/debian-10/rootfs/post-init.d/sql-mysql.sh
index 11b14a25f5bc..f5c8436f2e46 100755
--- a/bitnami/phpbb/3/debian-10/rootfs/post-init.d/sql-mysql.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/post-init.d/sql-mysql.sh
@@ -1,29 +1,46 @@
 #!/bin/bash
 #
-# Post-init script to execute SQL files with MySQL client
+# Executes custom Ruby init scripts
 
 # shellcheck disable=SC1091
 
+set -o errexit
+set -o nounset
+set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purposes
 
-. /opt/bitnami/base/functions
+# Load libraries with logging functions
+if [[ -f /opt/bitnami/base/functions ]]; then
+    . /opt/bitnami/base/functions
+else
+    . /opt/bitnami/scripts/liblog.sh
+fi
 
-readonly f="${1:?missing SQL file}"
-failure=0
-
-if [[ "$f" =~ ^.*(\.sql|\.sql\.gz)$ ]]; then
-    info "Executing $f"
-    mysql_cmd=( mysql -h "$MARIADB_HOST" -P "$MARIADB_PORT_NUMBER" -u "$MARIADB_ROOT_USER" )
+mysql_execute() {
+    local -r sql_file="${1:?missing file}"
+    local failure=0
+    mysql_cmd=("mysql" "-h" "$MARIADB_HOST" "-P" "$MARIADB_PORT_NUMBER" "-u" "$MARIADB_ROOT_USER")
     if [[ "${ALLOW_EMPTY_PASSWORD:-no}" != "yes" ]]; then
-        mysql_cmd+=( -p"$MARIADB_ROOT_PASSWORD" )
+        mysql_cmd+=("-p${MARIADB_ROOT_PASSWORD}")
     fi
-    if [[ "$f" == *".sql" ]]; then
-        "${mysql_cmd[@]}" < "$f" || failure=$?
-    elif [[ "$f" == *".sql.gz" ]]; then
-        gunzip -c "$f" | "${mysql_cmd[@]}" || failure=$?
+    if [[ "$sql_file" == *".sql" ]]; then
+        "${mysql_cmd[@]}" < "$sql_file" || failure=$?
+    elif [[ "$sql_file" == *".sql.gz" ]]; then
+        gunzip -c "$sql_file" | "${mysql_cmd[@]}" || failure=$?
     fi
+    return "$failure"
+}
+
+# Loop through all input files passed via stdin
+read -r -a custom_init_scripts <<< "$@"
+failure=0
+if [[ "${#custom_init_scripts[@]}" -gt 0 ]]; then
+    for custom_init_script in "${custom_init_scripts[@]}"; do
+        [[ ! "$custom_init_script" =~ ^.*(\.sql|\.sql\.gz)$ ]] && continue
+        info "Executing ${custom_init_script}"
+        mysql_execute "$custom_init_script" || failure=1
+        [[ "$failure" -ne 0 ]] && error "Failed to execute ${custom_init_script}"
+    done
 fi
-if [[ "$failure" -ne 0 ]]; then
-    error "Failed to execute ${f}"
-    exit "$failure"
-fi
+
+exit "$failure"
diff --git a/bitnami/phpbb/3/debian-10/rootfs/post-init.sh b/bitnami/phpbb/3/debian-10/rootfs/post-init.sh
old mode 100644
new mode 100755
index 788501c654c5..92de564cf768
--- a/bitnami/phpbb/3/debian-10/rootfs/post-init.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/post-init.sh
@@ -1,15 +1,23 @@
 #!/bin/bash
 
+# shellcheck disable=SC1091
+
+set -o errexit
+set -o nounset
+set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purposes
 
-. /opt/bitnami/base/functions
-
-if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/phpbb/.user_scripts_initialized" ]]; then
-    for f in /docker-entrypoint-init.d/*; do
-        for p in /post-init.d/*.sh; do
-            "$p" "$f"
+# Only execute init scripts once
+if [[ ! -f "/bitnami/phpbb/.user_scripts_initialized" ]]; then
+    read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | xargs -0)"
+    if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/phpbb/.user_scripts_initialized" ]]; then
+        mkdir -p "/bitnami/phpbb"
+        for init_script in "${init_scripts[@]}"; do
+            for init_script_type_handler in /post-init.d/*.sh; do
+                "$init_script_type_handler" "$init_script"
+            done
         done
-    done
-    info "Custom scripts were executed"
+    fi
+
     touch "/bitnami/phpbb/.user_scripts_initialized"
 fi
diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md
index ff11b2c8ab92..145b336d18a2 100644
--- a/bitnami/phpbb/README.md
+++ b/bitnami/phpbb/README.md
@@ -36,7 +36,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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-debian-10`, `3.3.0-debian-10-r146`, `3`, `3.3.0`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.0-debian-10-r146/3/debian-10/Dockerfile)
+* [`3-debian-10`, `3.3.0-debian-10-r147`, `3`, `3.3.0`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.0-debian-10-r147/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpbb GitHub repo](https://github.com/bitnami/bitnami-docker-phpbb).