From 5670793fe54c04286c2e1913f7d9270bbbc8bb22 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 9 Apr 2021 18:14:09 +0000 Subject: [PATCH] 2.7.1-debian-10-r68 release --- bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile | 2 +- .../2/debian-10/docker-compose.yml | 12 ++++++------ .../prebuildfs/opt/bitnami/scripts/liblog.sh | 2 ++ .../prebuildfs/opt/bitnami/scripts/libversion.sh | 4 ++-- .../opt/bitnami/scripts/spring-cloud-dataflow/run.sh | 6 ++++-- bitnami/spring-cloud-dataflow/README.md | 2 +- bitnami/spring-cloud-dataflow/docker-compose.yml | 12 ++++++------ 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile index d8c6325bfc2a..9dfe684017c1 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile +++ b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/spring-cloud-dataflow/postunpack.sh ENV BITNAMI_APP_NAME="spring-cloud-dataflow" \ - BITNAMI_IMAGE_VERSION="2.7.1-debian-10-r67" \ + BITNAMI_IMAGE_VERSION="2.7.1-debian-10-r68" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH" USER 1001 diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/docker-compose.yml b/bitnami/spring-cloud-dataflow/2/debian-10/docker-compose.yml index 99f059f4788e..4deec43ed7c1 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/docker-compose.yml +++ b/bitnami/spring-cloud-dataflow/2/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: spring-cloud-dataflow: - image: 'docker.io/bitnami/spring-cloud-dataflow:2-debian-10' + image: docker.io/bitnami/spring-cloud-dataflow:2 restart: always environment: - SERVER_PORT=9393 @@ -29,7 +29,7 @@ services: - spring-cloud-skipper spring-cloud-skipper: - image: 'docker.io/bitnami/spring-cloud-skipper:2-debian-10' + image: docker.io/bitnami/spring-cloud-skipper:2 restart: always environment: - SERVER_PORT=7577 @@ -47,7 +47,7 @@ services: - rabbitmq mariadb-dataflow: - image: 'docker.io/bitnami/mariadb:10.5-debian-10' + image: docker.io/bitnami/mariadb:10.5 environment: - MARIADB_ROOT_PASSWORD=root_password - MARIADB_USER=bn_dataflow @@ -57,7 +57,7 @@ services: - 'mariadb_dataflow_data:/bitnami' mariadb-skipper: - image: 'docker.io/bitnami/mariadb:10.5-debian-10' + image: docker.io/bitnami/mariadb:10.5 environment: - MARIADB_ROOT_PASSWORD=root_password - MARIADB_USER=bn_skipper @@ -67,7 +67,7 @@ services: - 'mariadb_skipper_data:/bitnami' mariadb-test: - image: 'docker.io/bitnami/mariadb:10.5-debian-10' + image: docker.io/bitnami/mariadb:10.5 environment: - MARIADB_ROOT_PASSWORD=root_password - MARIADB_USER=bn_test @@ -75,7 +75,7 @@ services: - MARIADB_DATABASE=test rabbitmq: - image: 'docker.io/bitnami/rabbitmq:3.8-debian-10' + image: docker.io/bitnami/rabbitmq:3.8 volumes: - 'rabbitmq_data:/bitnami' diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..c7c0f6d4422a 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,7 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done + # shellcheck disable=SC2001 + # Complex regex, see https://github.com/koalaman/shellcheck/wiki/SC2001#exceptions echo "$string" | sed "s/^/${indent_unit}/" } diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/spring-cloud-dataflow/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/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh b/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh index c3fb393418f6..51bbea78a96e 100755 --- a/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh +++ b/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-dataflow/run.sh @@ -2,7 +2,7 @@ # # Bitnami Spring Cloud Data Flow run -# shellcheck disable=SC1091 +# shellcheck disable=SC1091,SC2153 set -o errexit set -o nounset @@ -19,7 +19,9 @@ set -o pipefail info "** Starting Spring Cloud Data Flow **" __run_cmd="java" -__run_flags=($JAVA_OPTS "-jar" "-Duser.home=${HOME}" "${SPRING_CLOUD_DATAFLOW_BASE_DIR}/spring-cloud-dataflow.jar" "--spring.config.additional-location=${SPRING_CLOUD_DATAFLOW_CONF_FILE}" "$@") +read -r -a java_opts <<< "$JAVA_OPTS" +__run_flags=("-jar" "-Duser.home=${HOME}" "${SPRING_CLOUD_DATAFLOW_BASE_DIR}/spring-cloud-dataflow.jar" "--spring.config.additional-location=${SPRING_CLOUD_DATAFLOW_CONF_FILE}" "$@") +[[ "${#java_opts[@]}" -gt 0 ]] && __run_flags=("${java_opts[@]}" "${__run_flags[@]}") if am_i_root; then exec gosu "$SPRING_CLOUD_DATAFLOW_DAEMON_USER" "$__run_cmd" "${__run_flags[@]}" diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md index 7005d2ca828b..dffa2a48583a 100644 --- a/bitnami/spring-cloud-dataflow/README.md +++ b/bitnami/spring-cloud-dataflow/README.md @@ -39,7 +39,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/). -* [`2`, `2-debian-10`, `2.7.1`, `2.7.1-debian-10-r67`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.7.1-debian-10-r67/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.7.1`, `2.7.1-debian-10-r68`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.7.1-debian-10-r68/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/spring-cloud-dataflow GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow). diff --git a/bitnami/spring-cloud-dataflow/docker-compose.yml b/bitnami/spring-cloud-dataflow/docker-compose.yml index 99f059f4788e..4deec43ed7c1 100644 --- a/bitnami/spring-cloud-dataflow/docker-compose.yml +++ b/bitnami/spring-cloud-dataflow/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: spring-cloud-dataflow: - image: 'docker.io/bitnami/spring-cloud-dataflow:2-debian-10' + image: docker.io/bitnami/spring-cloud-dataflow:2 restart: always environment: - SERVER_PORT=9393 @@ -29,7 +29,7 @@ services: - spring-cloud-skipper spring-cloud-skipper: - image: 'docker.io/bitnami/spring-cloud-skipper:2-debian-10' + image: docker.io/bitnami/spring-cloud-skipper:2 restart: always environment: - SERVER_PORT=7577 @@ -47,7 +47,7 @@ services: - rabbitmq mariadb-dataflow: - image: 'docker.io/bitnami/mariadb:10.5-debian-10' + image: docker.io/bitnami/mariadb:10.5 environment: - MARIADB_ROOT_PASSWORD=root_password - MARIADB_USER=bn_dataflow @@ -57,7 +57,7 @@ services: - 'mariadb_dataflow_data:/bitnami' mariadb-skipper: - image: 'docker.io/bitnami/mariadb:10.5-debian-10' + image: docker.io/bitnami/mariadb:10.5 environment: - MARIADB_ROOT_PASSWORD=root_password - MARIADB_USER=bn_skipper @@ -67,7 +67,7 @@ services: - 'mariadb_skipper_data:/bitnami' mariadb-test: - image: 'docker.io/bitnami/mariadb:10.5-debian-10' + image: docker.io/bitnami/mariadb:10.5 environment: - MARIADB_ROOT_PASSWORD=root_password - MARIADB_USER=bn_test @@ -75,7 +75,7 @@ services: - MARIADB_DATABASE=test rabbitmq: - image: 'docker.io/bitnami/rabbitmq:3.8-debian-10' + image: docker.io/bitnami/rabbitmq:3.8 volumes: - 'rabbitmq_data:/bitnami'