From 51b2def9a15b93c121cdeb0cea5cea2d39114134 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 17 Jun 2020 19:52:48 +0000
Subject: [PATCH] 5.0.2-debian-10-r85 release

---
 bitnami/phpmyadmin/5/debian-10/Dockerfile                  | 2 +-
 .../5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh   | 7 +++++--
 bitnami/phpmyadmin/README.md                               | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile
index 5679d3c81855..149f7b464956 100644
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r84" \
+    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r85" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
index c0238af61d02..8ad2e2ebedc1 100644
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
@@ -51,15 +51,18 @@ export APACHE_DAEMON_USER="daemon"
 export WEB_SERVER_DAEMON_USER="$APACHE_DAEMON_USER"
 export APACHE_DAEMON_GROUP="daemon"
 export WEB_SERVER_DAEMON_GROUP="$APACHE_DAEMON_GROUP"
+export WEB_SERVER_GROUP="$APACHE_DAEMON_GROUP"
+
+# Apache configuration
 export APACHE_DEFAULT_HTTP_PORT_NUMBER="8080" # only used at build time
 export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$APACHE_DEFAULT_HTTP_PORT_NUMBER"
 export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" # only used at build time
 export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER"
-
-# Apache configuration
 export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}"
 export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER"
 export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}"
+export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}"
+export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${WEB_SERVER_HTTPS_PORT:-}"}"
 export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index 6425a546005a..c37cb62fc462 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/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/).
 
 
-* [`5-debian-10`, `5.0.2-debian-10-r84`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r84/5/debian-10/Dockerfile)
+* [`5-debian-10`, `5.0.2-debian-10-r85`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r85/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).