From d871e8748960078cee238ff5411ea1733eae7267 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 9 Mar 2021 16:06:11 +0000
Subject: [PATCH] 5.1.0-debian-10-r6 release

---
 bitnami/phpmyadmin/5/debian-10/Dockerfile             |  4 ++--
 .../prebuildfs/opt/bitnami/scripts/libservice.sh      | 11 ++++++++++-
 bitnami/phpmyadmin/README.md                          |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile
index 2e0e52b8f115..994c1f9aa4b2 100644
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2"
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/phpmyadmin/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r5" \
+    BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r6" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index 55e1dfc4ab28..0f6c62b8c894 100644
--- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -103,6 +103,8 @@ generate_cron_conf() {
     local run_as="root"
     local schedule="* * * * *"
 
+    local clean="true"
+
     # Parse optional CLI flags
     shift 2
     while [[ "$#" -gt 0 ]]; do
@@ -115,6 +117,9 @@ generate_cron_conf() {
                 shift
                 schedule="$1"
                 ;;
+            --no-clean)
+                clean="false"
+                ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
                 return 1
@@ -124,7 +129,11 @@ generate_cron_conf() {
     done
 
     mkdir -p /etc/cron.d
-    echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+    if "$clean"; then
+        echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+    else
+        echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
+    fi
 }
 
 ########################
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index 172434f8919f..0e87b04f47e7 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -38,7 +38,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`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r5`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r5/5/debian-10/Dockerfile)
+* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r6`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r6/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).