From ecfa93640c9073e05656fe701f4ab87f705033a6 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 7 Feb 2020 13:34:10 +0000
Subject: [PATCH] 3.9.15-debian-10-r2 release

---
 bitnami/joomla/3/debian-10/Dockerfile                | 6 +++++-
 bitnami/joomla/3/debian-10/rootfs/apache-inputs.json | 6 ++++++
 bitnami/joomla/3/debian-10/rootfs/post-init.sh       | 4 ++--
 bitnami/joomla/README.md                             | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 bitnami/joomla/3/debian-10/rootfs/apache-inputs.json

diff --git a/bitnami/joomla/3/debian-10/Dockerfile b/bitnami/joomla/3/debian-10/Dockerfile
index 64342a1c5078..1e7723ade4bc 100644
--- a/bitnami/joomla/3/debian-10/Dockerfile
+++ b/bitnami/joomla/3/debian-10/Dockerfile
@@ -20,8 +20,12 @@ RUN /build/install-tini.sh
 
 COPY rootfs /
 ENV ALLOW_EMPTY_PASSWORD="no" \
+    APACHE_HTTPS_PORT_NUMBER="" \
+    APACHE_HTTP_PORT_NUMBER="" \
+    APACHE_SET_HTTPS_PORT="no" \
+    APACHE_SET_HTTP_PORT="no" \
     BITNAMI_APP_NAME="joomla" \
-    BITNAMI_IMAGE_VERSION="3.9.15-debian-10-r1" \
+    BITNAMI_IMAGE_VERSION="3.9.15-debian-10-r2" \
     JOOMLA_DATABASE_NAME="bitnami_joomla" \
     JOOMLA_DATABASE_PASSWORD="" \
     JOOMLA_DATABASE_USER="bn_joomla" \
diff --git a/bitnami/joomla/3/debian-10/rootfs/apache-inputs.json b/bitnami/joomla/3/debian-10/rootfs/apache-inputs.json
new file mode 100644
index 000000000000..25e01aaf4e76
--- /dev/null
+++ b/bitnami/joomla/3/debian-10/rootfs/apache-inputs.json
@@ -0,0 +1,6 @@
+{
+  "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
+  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}",
+  "setHttpPort": "{{$global.env.APACHE_SET_HTTP_PORT}}",
+  "setHttpsPort": "{{$global.env.APACHE_SET_HTTPS_PORT}}"
+}
\ No newline at end of file
diff --git a/bitnami/joomla/3/debian-10/rootfs/post-init.sh b/bitnami/joomla/3/debian-10/rootfs/post-init.sh
index d6a96bd2ac85..9d6727ce6c74 100644
--- a/bitnami/joomla/3/debian-10/rootfs/post-init.sh
+++ b/bitnami/joomla/3/debian-10/rootfs/post-init.sh
@@ -2,7 +2,7 @@
 
 . /opt/bitnami/base/functions
 
-if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f /bitnami/"$BITNAMI_APP_NAME"/.user_scripts_initialized ]]; then
+if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/$BITNAMI_APP_NAME/.user_scripts_initialized" ]]; then
     for f in /docker-entrypoint-init.d/*; do
         failure=0
         case "$f" in
@@ -42,5 +42,5 @@ if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f /bitnami/"$BITNAMI_APP_NAME"/.u
         fi
     done
     info "Custom scripts were executed"
-    touch /bitnami/"$BITNAMI_APP_NAME"/.user_scripts_initialized
+    touch "/bitnami/$BITNAMI_APP_NAME/.user_scripts_initialized"
 fi
diff --git a/bitnami/joomla/README.md b/bitnami/joomla/README.md
index 28af2cb7a8b1..ef7aa39075bf 100644
--- a/bitnami/joomla/README.md
+++ b/bitnami/joomla/README.md
@@ -39,7 +39,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`3-ol-7`, `3.9.15-ol-7-r7` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/3.9.15-ol-7-r7/3/ol-7/Dockerfile)
-* [`3-debian-10`, `3.9.15-debian-10-r1`, `3`, `3.9.15`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/3.9.15-debian-10-r1/3/debian-10/Dockerfile)
+* [`3-debian-10`, `3.9.15-debian-10-r2`, `3`, `3.9.15`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-joomla/blob/3.9.15-debian-10-r2/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/joomla GitHub repo](https://github.com/bitnami/bitnami-docker-joomla).