From 813c7a84d7efb071208145c7d084c9b209e548cc Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 9 Mar 2021 02:41:52 +0000
Subject: [PATCH] 3.8.14-debian-10-r5 release

---
 bitnami/rabbitmq/3.8/debian-10/Dockerfile             |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libservice.sh      | 11 ++++++++++-
 bitnami/rabbitmq/README.md                            |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bitnami/rabbitmq/3.8/debian-10/Dockerfile b/bitnami/rabbitmq/3.8/debian-10/Dockerfile
index a30d636b043e..6549783a45bf 100644
--- a/bitnami/rabbitmq/3.8/debian-10/Dockerfile
+++ b/bitnami/rabbitmq/3.8/debian-10/Dockerfile
@@ -24,7 +24,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="rabbitmq" \
-    BITNAMI_IMAGE_VERSION="3.8.14-debian-10-r4" \
+    BITNAMI_IMAGE_VERSION="3.8.14-debian-10-r5" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en"
 
diff --git a/bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index 55e1dfc4ab28..0f6c62b8c894 100644
--- a/bitnami/rabbitmq/3.8/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/rabbitmq/3.8/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/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index 2f6cf795d7e1..11389167236f 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -51,7 +51,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`3.8`, `3.8-debian-10`, `3.8.14`, `3.8.14-debian-10-r4`, `latest` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.14-debian-10-r4/3.8/debian-10/Dockerfile)
+* [`3.8`, `3.8-debian-10`, `3.8.14`, `3.8.14-debian-10-r5`, `latest` (3.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.8.14-debian-10-r5/3.8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).