From 7a32abd81ee6b66d49bc94569c703a5ecef3b433 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 7 Apr 2021 16:47:21 +0000 Subject: [PATCH] 2.7.1-debian-10-r72 release --- .../2/debian-10/Dockerfile | 2 +- .../2/debian-10/docker-compose.yml | 2 +- .../2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh | 2 +- .../2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh | 4 ++-- .../bitnami/scripts/scdf-composed-task-runner/entrypoint.sh | 2 +- bitnami/spring-cloud-dataflow-composed-task-runner/README.md | 2 +- .../docker-compose.yml | 2 +- 7 files changed, 8 insertions(+), 8 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 d5567e6e6c6d..88b3a25326ff 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.7.1-debian-10-r71" \ + BITNAMI_IMAGE_VERSION="2.7.1-debian-10-r72" \ 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/docker-compose.yml b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/docker-compose.yml index 6e4bb4b67642..530b368e01b2 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/docker-compose.yml +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/docker-compose.yml @@ -2,4 +2,4 @@ version: '2' services: spring-cloud-dataflow-composed-task-runner: - image: docker.io/bitnami/spring-cloud-dataflow-composed-task-runner:2-debian-10 + image: docker.io/bitnami/spring-cloud-dataflow-composed-task-runner:2 diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..cfc824f5ec83 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,5 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done - echo "$string" | sed "s/^/${indent_unit}/" + echo "${string//^/${indent_unit}}" } diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -9,7 +9,7 @@ # Functions ######################## -# Gets semantic version +# Gets semantic version # Arguments: # $1 - version: string to extract major.minor.patch # $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch @@ -38,7 +38,7 @@ get_sematic_version () { done local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then echo "${version_sections[$section]}" return else diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/rootfs/opt/bitnami/scripts/scdf-composed-task-runner/entrypoint.sh b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/rootfs/opt/bitnami/scripts/scdf-composed-task-runner/entrypoint.sh index e68d7072156f..cb29ef1c9764 100755 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/rootfs/opt/bitnami/scripts/scdf-composed-task-runner/entrypoint.sh +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-10/rootfs/opt/bitnami/scripts/scdf-composed-task-runner/entrypoint.sh @@ -24,7 +24,7 @@ am_i_root && ensure_user_exists "$SCDF_COMPOSED_TASK_RUNNER_DAEMON_USER" --group info "** Starting Spring Cloud Dataflow Compose Task Runner **" __run_cmd="java" -__run_flags=($JAVA_OPTS "-jar" "-Duser.home=${HOME}" "${SCDF_COMPOSED_TASK_RUNNER_BASE_DIR}/scdf-composed-task-runner.jar" "$@") +__run_flags=("$JAVA_OPTS" "-jar" "-Duser.home=${HOME}" "${SCDF_COMPOSED_TASK_RUNNER_BASE_DIR}/scdf-composed-task-runner.jar" "$@") if am_i_root; then exec gosu "$SCDF_COMPOSED_TASK_RUNNER_DAEMON_USER" "$__run_cmd" "${__run_flags[@]}" diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md index cc23cec99ee8..841624965cc7 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.7.1`, `2.7.1-debian-10-r71`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.7.1-debian-10-r71/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.7.1`, `2.7.1-debian-10-r72`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.7.1-debian-10-r72/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). diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/docker-compose.yml b/bitnami/spring-cloud-dataflow-composed-task-runner/docker-compose.yml index 6e4bb4b67642..530b368e01b2 100644 --- a/bitnami/spring-cloud-dataflow-composed-task-runner/docker-compose.yml +++ b/bitnami/spring-cloud-dataflow-composed-task-runner/docker-compose.yml @@ -2,4 +2,4 @@ version: '2' services: spring-cloud-dataflow-composed-task-runner: - image: docker.io/bitnami/spring-cloud-dataflow-composed-task-runner:2-debian-10 + image: docker.io/bitnami/spring-cloud-dataflow-composed-task-runner:2