From 039ab4bedeebce59379bc042bd7827a5f9e0c37c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 16 Feb 2021 20:45:44 +0000
Subject: [PATCH] 7.11.18-debian-10-r94 release

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

diff --git a/bitnami/suitecrm/7/debian-10/Dockerfile b/bitnami/suitecrm/7/debian-10/Dockerfile
index 1d5960f21c5e..8803c0d4e9cd 100644
--- a/bitnami/suitecrm/7/debian-10/Dockerfile
+++ b/bitnami/suitecrm/7/debian-10/Dockerfile
@@ -21,8 +21,8 @@ RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/suitecrm/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -30,7 +30,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="suitecrm" \
-    BITNAMI_IMAGE_VERSION="7.11.18-debian-10-r93" \
+    BITNAMI_IMAGE_VERSION="7.11.18-debian-10-r94" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
index ea3480702bb4..eec592498ecd 100644
--- a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
+++ b/bitnami/suitecrm/7/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/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
index ae42e8827305..de6600ffb0ed 100644
--- a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh
+++ b/bitnami/suitecrm/7/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/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index 9ff4e1d53912..bfa1c683afc8 100644
--- a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/suitecrm/7/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/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/suitecrm-env.sh b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/suitecrm-env.sh
index 359ba2383a74..bda3df4f2bd0 100644
--- a/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/suitecrm-env.sh
+++ b/bitnami/suitecrm/7/debian-10/rootfs/opt/bitnami/scripts/suitecrm-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"
 
@@ -50,8 +53,12 @@ suitecrm_env_vars=(
 for env_var in "${suitecrm_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 suitecrm_env_vars
diff --git a/bitnami/suitecrm/README.md b/bitnami/suitecrm/README.md
index 8c94766300cd..8e6b148b7684 100644
--- a/bitnami/suitecrm/README.md
+++ b/bitnami/suitecrm/README.md
@@ -42,7 +42,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/).
 
 
-* [`7`, `7-debian-10`, `7.11.18`, `7.11.18-debian-10-r93`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.11.18-debian-10-r93/7/debian-10/Dockerfile)
+* [`7`, `7-debian-10`, `7.11.18`, `7.11.18-debian-10-r94`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.11.18-debian-10-r94/7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/suitecrm GitHub repo](https://github.com/bitnami/bitnami-docker-suitecrm).