From 99495f4960c7699dc75ded3b1807372434b9471c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 9 Mar 2021 00:45:36 +0000
Subject: [PATCH] 1.12.1-debian-10-r17 release

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

diff --git a/bitnami/fluentd/1/debian-10/Dockerfile b/bitnami/fluentd/1/debian-10/Dockerfile
index 2aea66ff5c5c..f42c08ad05e7 100644
--- a/bitnami/fluentd/1/debian-10/Dockerfile
+++ b/bitnami/fluentd/1/debian-10/Dockerfile
@@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/fluentd/postunpack.sh
 ENV BITNAMI_APP_NAME="fluentd" \
-    BITNAMI_IMAGE_VERSION="1.12.1-debian-10-r16" \
+    BITNAMI_IMAGE_VERSION="1.12.1-debian-10-r17" \
     GEM_HOME="/opt/bitnami/fluentd" \
     PATH="/opt/bitnami/ruby/bin:/opt/bitnami/common/bin:/opt/bitnami/fluentd/bin:$PATH"
 
diff --git a/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index 55e1dfc4ab28..0f6c62b8c894 100644
--- a/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/fluentd/1/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/fluentd/README.md b/bitnami/fluentd/README.md
index be56d8f1adaa..8e217a206d51 100644
--- a/bitnami/fluentd/README.md
+++ b/bitnami/fluentd/README.md
@@ -32,7 +32,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/).
 
 
-* [`1`, `1-debian-10`, `1.12.1`, `1.12.1-debian-10-r16`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.12.1-debian-10-r16/1/debian-10/Dockerfile)
+* [`1`, `1-debian-10`, `1.12.1`, `1.12.1-debian-10-r17`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.12.1-debian-10-r17/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/fluentd GitHub repo](https://github.com/bitnami/bitnami-docker-fluentd).