From 908d773f74830e7cc03c18c200c05c5c308024bb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 31 Jul 2020 22:13:11 +0000
Subject: [PATCH] 5.0.2-debian-10-r125 release

---
 bitnami/phpmyadmin/5/debian-10/Dockerfile          |  2 +-
 .../debian-10/rootfs/opt/bitnami/scripts/libphp.sh | 14 ++++++++++++++
 .../rootfs/opt/bitnami/scripts/php-env.sh          |  2 ++
 bitnami/phpmyadmin/README.md                       |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile
index 5335671ca971..08e920348d91 100644
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -30,7 +30,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-r124" \
+    BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r125" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
index 92ca554d4013..4e14d5d2fc5e 100644
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
@@ -59,6 +59,7 @@ php_initialize() {
     ! is_empty_value "$PHP_UPLOAD_MAX_FILESIZE" && info "Setting PHP upload_max_filesize option" && php_conf_set upload_max_filesize "$PHP_UPLOAD_MAX_FILESIZE"
     ! is_empty_value "$PHP_POST_MAX_SIZE" && info "Setting PHP post_max_size option" && php_conf_set post_max_size "$PHP_POST_MAX_SIZE"
     ! is_empty_value "$PHP_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT"
+    ! is_empty_value "$PHP_MAX_EXECUTION_TIME" && info "Setting PHP max_execution_time option" && php_conf_set max_execution_time "$PHP_MAX_EXECUTION_TIME"
 
     # PHP-FPM configuration
     ! is_empty_value "$PHP_FPM_LISTEN_ADDRESS" && info "Setting PHP-FPM listen option" && php_conf_set "listen" "$PHP_FPM_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm.d/www.conf"
@@ -96,6 +97,19 @@ php_fpm_stop() {
     stop_service_using_pid "$PHP_FPM_PID_FILE" "$signal"
 }
 
+########################
+# Reload PHP-FPM configuration
+# Globals:
+#   PHP_FPM_PID_FILE
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+php_fpm_reload() {
+    php_fpm_stop "USR2"
+}
+
 ########################
 # Check if PHP-FPM is running
 # Globals:
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
index 60633c6ac219..4c9fd6739481 100644
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/php-env.sh
@@ -22,6 +22,7 @@ php_env_vars=(
     PHP_UPLOAD_MAX_FILESIZE
     PHP_POST_MAX_SIZE
     PHP_MEMORY_LIMIT
+    PHP_MAX_EXECUTION_TIME
 
 )
 for env_var in "${php_env_vars[@]}"; do
@@ -63,5 +64,6 @@ export PHP_FPM_DAEMON_GROUP="daemon"
 export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}"
 export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}"
 export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-}"
+export PHP_MAX_EXECUTION_TIME="${PHP_MAX_EXECUTION_TIME:-}"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index 06f7d13496f5..ef8d2ace82d7 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-r124`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r124/5/debian-10/Dockerfile)
+* [`5-debian-10`, `5.0.2-debian-10-r125`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r125/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).