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 78f7e0ddea78..4a25c4e97924 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-r73" \ + BITNAMI_IMAGE_VERSION="2.7.1-debian-10-r74" \ 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/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 cb29ef1c9764..974a36c1c767 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 @@ -2,7 +2,7 @@ # # Bitnami Spring Cloud Dataflow Compose Task Runner entrypoint -# shellcheck disable=SC1091 +# shellcheck disable=SC1091,SC2153 set -o errexit set -o nounset @@ -24,7 +24,9 @@ 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" "$@") +read -r -a java_opts <<< "$JAVA_OPTS" +__run_flags=("-jar" "-Duser.home=${HOME}" "${SCDF_COMPOSED_TASK_RUNNER_BASE_DIR}/scdf-composed-task-runner.jar" "$@") +[[ "${#java_opts[@]}" -gt 0 ]] && __run_flags=("${java_opts[@]}" "${__run_flags[@]}") 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 505ce4c2a714..4aa41f336fb4 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-r73`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.7.1-debian-10-r73/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.7.1`, `2.7.1-debian-10-r74`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow-composed-task-runner/blob/2.7.1-debian-10-r74/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).