From 3338dd0301014f33c49657bb51fb0ef414c4ffb5 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 24 Aug 2021 03:08:50 +0000 Subject: [PATCH] 2.8.1-debian-10-r56 release --- .../2/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libfile.sh | 24 +++++++++++++++++-- .../README.md | 2 +- 3 files changed, 24 insertions(+), 4 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 7c021fed34b3..8e00f1185302 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-r55" \ + BITNAMI_IMAGE_VERSION="2.8.1-debian-10-r56" \ 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 dd47f25e4e45..41ebaf7464f6 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 @@ -10,7 +10,7 @@ # Functions ######################## -# Replace a regex in a file +# Replace a regex-matching string in a file # Arguments: # $1 - filename # $2 - match regex @@ -30,7 +30,7 @@ replace_in_file() { # We should avoid using 'sed in-place' substitutions # 1) They are not compatible with files mounted from ConfigMap(s) # 2) We found incompatibility issues with Debian10 and "in-place" substitutions - del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues if [[ $posix_regex = true ]]; then result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" else @@ -39,6 +39,26 @@ replace_in_file() { echo "$result" > "$filename" } +######################## +# Replace a regex-matching multiline string in a file +# Arguments: +# $1 - filename +# $2 - match regex +# $3 - substitute regex +# Returns: +# None +######################### +replace_in_file_multiline() { + local filename="${1:?filename is required}" + local match_regex="${2:?match regex is required}" + local substitute_regex="${3:?substitute regex is required}" + + local result + local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")" + echo "$result" > "$filename" +} + ######################## # Remove a line in a file based on a regex # Arguments: diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md index c50ea0a79ae5..a5c84171251b 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-r55`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.8.1-debian-10-r55/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.8.1`, `2.8.1-debian-10-r56`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.8.1-debian-10-r56/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).