From dc21e756f6e442d5c2cd2e740ff7afa8a63bf9f3 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 8 Jul 2021 07:48:09 +0000
Subject: [PATCH] 1.13.1-debian-10-r11 release

---
 bitnami/fluentd/1/debian-10/Dockerfile        |  4 +-
 .../opt/bitnami/.bitnami_components.json      |  4 +-
 .../prebuildfs/opt/bitnami/scripts/libfile.sh | 39 +++++++++++++++++++
 bitnami/fluentd/README.md                     |  2 +-
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/bitnami/fluentd/1/debian-10/Dockerfile b/bitnami/fluentd/1/debian-10/Dockerfile
index e8f2f40b1bc8..291ebaa214e6 100644
--- a/bitnami/fluentd/1/debian-10/Dockerfile
+++ b/bitnami/fluentd/1/debian-10/Dockerfile
@@ -9,7 +9,7 @@ ENV HOME="/" \
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl ghostscript gzip imagemagick libc6 libgcc1 libgmp-dev libjemalloc-dev libncurses5-dev libncurses6 libreadline-dev libreadline7 libssl-dev libssl1.1 libstdc++6 libtinfo6 libxml2-dev libxslt1-dev procps sqlite3 tar wget zlib1g zlib1g-dev
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ruby" "2.6.7-0" --checksum 3d605c181d6ae44f6a6debb7c89a4dc64081b5ee28ca41354946f1fa5cd1276a
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ruby" "2.6.8-0" --checksum 5624996a06ed81e41cbd35305906255dd79c00930e7f069dbc52011edcabdc45
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.13.0-0" --checksum fd7257c2736164d02832dbf72e2c1ed9d875bf3e32f0988520796bc503330129
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "fluentd" "1.13.1-0" --checksum 73d34ac9914edca3cab6049d52bb2aa42585ca7e756f0f8a73295e2c30b5360a
 RUN chmod g+rwX /opt/bitnami
@@ -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.13.1-debian-10-r10" \
+    BITNAMI_IMAGE_VERSION="1.13.1-debian-10-r11" \
     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/.bitnami_components.json b/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index a841c20a5b25..85dfcc3ddc4e 100644
--- a/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,9 +15,9 @@
     },
     "ruby": {
         "arch": "amd64",
-        "digest": "3d605c181d6ae44f6a6debb7c89a4dc64081b5ee28ca41354946f1fa5cd1276a",
+        "digest": "5624996a06ed81e41cbd35305906255dd79c00930e7f069dbc52011edcabdc45",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.6.7-0"
+        "version": "2.6.8-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
index b09575cbe4a6..dd47f25e4e45 100644
--- a/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/fluentd/1/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -2,6 +2,11 @@
 #
 # Library for managing files
 
+# shellcheck disable=SC1091
+
+# Load Generic Libraries
+. /opt/bitnami/scripts/libos.sh
+
 # Functions
 
 ########################
@@ -78,3 +83,37 @@ append_file_after_last_match() {
     result="$(tac "$file" | sed -E "0,/($match_regex)/s||${value}\n\1|" | tac)"
     echo "$result" > "$file"
 }
+
+########################
+# Wait until certain entry is present in a log file
+# Arguments:
+#   $1 - entry to look for
+#   $2 - log file
+#   $3 - max retries. Default: 12
+#   $4 - sleep between retries (in seconds). Default: 5
+# Returns:
+#   Boolean
+#########################
+wait_for_log_entry() {
+    local -r entry="${1:-missing entry}"
+    local -r log_file="${2:-missing log file}"
+    local -r retries="${3:-12}"
+    local -r interval_time="${4:-5}"
+    local attempt=0
+
+    check_log_file_for_entry() {
+        if ! grep -qE "$entry" "$log_file"; then
+            debug "Entry \"${entry}\" still not present in ${log_file} (attempt $((++attempt))/${retries})"
+            return 1
+        fi
+    }
+    debug "Checking that ${log_file} log file contains entry \"${entry}\""
+    if retry_while check_log_file_for_entry "$retries" "$interval_time"; then
+        debug "Found entry \"${entry}\" in ${log_file}"
+        true
+    else
+        error "Could not find entry \"${entry}\" in ${log_file} after ${retries} retries"
+        debug_execute cat "$log_file"
+        return 1
+    fi
+}
diff --git a/bitnami/fluentd/README.md b/bitnami/fluentd/README.md
index 6790f7268688..f469ac88f0a8 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.13.1`, `1.13.1-debian-10-r10`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.13.1-debian-10-r10/1/debian-10/Dockerfile)
+* [`1`, `1-debian-10`, `1.13.1`, `1.13.1-debian-10-r11`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-fluentd/blob/1.13.1-debian-10-r11/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/fluentd GitHub repo](https://github.com/bitnami/bitnami-docker-fluentd).