From 01c4497a8aaeba161faaf35f08f5d1abe4e9791b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Jul 2021 05:51:02 +0000 Subject: [PATCH] 2.8.1-debian-10-r11 release --- .../2/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libfile.sh | 39 +++++++++++++++++++ .../README.md | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/Dockerfile index 4e4a59cf1032..6f8dc54c549d 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/Dockerfile +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/Dockerfile @@ -17,7 +17,7 @@ RUN mkdir /.m2 && chmod -R g+rwX /.m2 COPY rootfs / ENV BITNAMI_APP_NAME="spring-cloud-dataflow-composed-task-runner" \ - BITNAMI_IMAGE_VERSION="2.8.1-debian-10-r10" \ + BITNAMI_IMAGE_VERSION="2.8.1-debian-10-r11" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH" USER 1001 diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh index b09575cbe4a6..dd47f25e4e45 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/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/spring-cloud-dataflow-composed-task-runner/README.md b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md index 1bc2bc6384d3..53f513d07f9c 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md @@ -28,7 +28,7 @@ $ docker run --name spring-cloud-dataflow-composed-task-runner bitnami/spring-cl 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/). -* [`2`, `2-debian-10`, `2.8.1`, `2.8.1-debian-10-r10`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.8.1-debian-10-r10/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.8.1`, `2.8.1-debian-10-r11`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.8.1-debian-10-r11/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/spring-cloud-dataflow-composed-task-runner GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner).