From 358eafae8b2efe28a5d8825fce9d66ccba9b57d3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 18 Jun 2020 15:47:34 +0000 Subject: [PATCH] 2.5.1-debian-10-r2 release --- .../2/debian-10/Dockerfile | 3 +- .../2/debian-10/docker-compose.yml | 33 ++-- .../bitnami/scripts/libspringclouddataflow.sh | 162 ------------------ .../scripts/spring-cloud-dataflow-env.sh | 36 +--- .../spring-cloud-dataflow/entrypoint.sh | 1 - .../spring-cloud-dataflow/postunpack.sh | 8 +- .../scripts/spring-cloud-dataflow/run.sh | 3 +- .../scripts/spring-cloud-dataflow/setup.sh | 33 +++- bitnami/spring-cloud-dataflow/README.md | 31 ++-- .../spring-cloud-dataflow/docker-compose.yml | 33 ++-- 10 files changed, 93 insertions(+), 250 deletions(-) delete mode 100644 bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/libspringclouddataflow.sh diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile index 3e607946cf53..6891d578a720 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile +++ b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile @@ -19,8 +19,7 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN /opt/bitnami/scripts/spring-cloud-dataflow/postunpack.sh ENV BITNAMI_APP_NAME="spring-cloud-dataflow" \ - BITNAMI_IMAGE_VERSION="2.5.1-debian-10-r1" \ - JAVA_TOOL_OPTIONS="-Duser.home=/bitnami/spring-cloud-dataflow" \ + BITNAMI_IMAGE_VERSION="2.5.1-debian-10-r2" \ 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 dc9ce8fbcf46..f13d2389f6bd 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/docker-compose.yml +++ b/bitnami/spring-cloud-dataflow/2/debian-10/docker-compose.yml @@ -6,21 +6,24 @@ services: restart: always environment: - SERVER_PORT=9393 - - SPRING_CLOUD_DATAFLOW_DATABASE_URL=jdbc:mariadb://mariadb-dataflow:3306/dataflow?useMysqlMetadata=true - - SPRING_CLOUD_DATAFLOW_DATABASE_USERNAME=bn_dataflow - - SPRING_CLOUD_DATAFLOW_DATABASE_PASSWORD=bn_dataflow - # enable advances features + # configuring database + - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb-dataflow:3306/dataflow?useMysqlMetadata=true + - SPRING_DATASOURCE_USERNAME=bn_dataflow + - SPRING_DATASOURCE_PASSWORD=bn_dataflow + - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver + # we use mariadb 10.2+ so we need to set hibernate dialect. + - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB102Dialect + # enable advance features - SPRING_CLOUD_DATAFLOW_FEATURES_STREAMS_ENABLED=true - SPRING_CLOUD_DATAFLOW_FEATURES_TASKS_ENABLED=true # configure dataflow stream - SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI=http://spring-cloud-skipper:7577/api - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_HOST=rabbitmq - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_PORT=5672 - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_USERNAME=user - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_PASSWORD=bitnami + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.host=rabbitmq + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.port=5672 + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.username=user + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.password=bitnami ports: - '9393:9393' - - '9000-9099:9000-9099' depends_on: - mariadb-dataflow - spring-cloud-skipper @@ -30,11 +33,15 @@ services: restart: always environment: - SERVER_PORT=7577 - - SPRING_CLOUD_SKIPPER_DATABASE_URL=jdbc:mariadb://mariadb-skipper:3306/skipper?useMysqlMetadata=true - - SPRING_CLOUD_SKIPPER_DATABASE_USERNAME=bn_skipper - - SPRING_CLOUD_SKIPPER_DATABASE_PASSWORD=bn_skipper + - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_LOW=20000 + - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_HIGH=20100 + - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb-skipper:3306/skipper?useMysqlMetadata=true + - SPRING_DATASOURCE_USERNAME=bn_skipper + - SPRING_DATASOURCE_PASSWORD=bn_skipper + - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver + - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB102Dialect ports: - - '9100-9199:9100-9199' + - "20000-20100:20000-20100" depends_on: - mariadb-skipper - rabbitmq diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/libspringclouddataflow.sh b/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/libspringclouddataflow.sh deleted file mode 100644 index 9033d7a85f65..000000000000 --- a/bitnami/spring-cloud-dataflow/2/debian-10/rootfs/opt/bitnami/scripts/libspringclouddataflow.sh +++ /dev/null @@ -1,162 +0,0 @@ -#!/bin/bash -# -# Bitnami Spring Cloud Data Flow library - -# shellcheck disable=SC1091 - -# Load Generic Libraries -. /opt/bitnami/scripts/libfile.sh -. /opt/bitnami/scripts/libfs.sh -. /opt/bitnami/scripts/liblog.sh -. /opt/bitnami/scripts/libnet.sh -. /opt/bitnami/scripts/libservice.sh -. /opt/bitnami/scripts/libvalidations.sh - -######################## -# Validate settings in SPRING_CLOUD_DATAFLOW_* environment variables -# Globals: -# SPRING_CLOUD_DATAFLOW_* -# Arguments: -# None -# Returns: -# None -######################### -dataflow_validate() { - info "Validating settings in SPRING_CLOUD_DATAFLOW_* env vars" - local error_code=0 - - print_validation_error() { - error "$1" - error_code=1 - } - - if [[ "$SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API" = "true" ]]; then - if is_empty_value "$SPRING_CLOUD_KUBERNETES_SECRETS_PATHS"; then - print_validation_error "You set the environment variable SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API=true. A Kubernetes secrect is expected to be mounted in SPRING_CLOUD_KUBERNETES_SECRETS_PATHS." - else - warn "Using Kubernetes Secrets." - fi - - is_empty_value "$SPRING_CLOUD_KUBERNETES_CONFIG_NAME" && print_validation_error "If SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API=true. You must set a ConfigMap name in SPRING_CLOUD_KUBERNETES_CONFIG_NAME." - fi - - if [[ "$SPRING_CLOUD_DATAFLOW_FEATURES_STREAMS_ENABLED" = "true" ]]; then - is_empty_value "$SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI" && print_validation_error "If SPRING_CLOUD_DATAFLOW_FEATURES_STREAMS_ENABLED=true then you must set a skipper server URI in SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI" - fi - - ! is_empty_value "$SERVER_PORT" && ! validate_port -unprivileged "$SERVER_PORT" && print_validation_error "SERVER_PORT with value = ${SERVER_PORT} is not a valid port." - - [[ "$error_code" -eq 0 ]] || return "$error_code" -} - -######################## -# Creates Spring Cloud Data Flow default configuration file -# Globals: -# SPRING_CLOUD_DATAFLOW_* -# Arguments: -# None -# Returns: -# None -######################### -dataflow_create_default_config() { - info "Creating '${SPRING_CLOUD_DATAFLOW_CONF_FILE}' as the main configuration file with default values" - cat > "$SPRING_CLOUD_DATAFLOW_CONF_FILE" < This [CVE scan report](https://quay.io/repository/bitnami/spring-cloud-dataflow?tab=tags) contains a security report with all open CVEs. To get the list of actionable security issues, find the "latest" tag, click the vulnerability report link under the corresponding "Security scan" field and then select the "Only show fixable" filter on the next page. -# How to deploy Thanos in Kubernetes? +# How to deploy Data Flow in Kubernetes? Deploying Bitnami applications as Helm Charts is the easiest way to get started with our applications on Kubernetes. Read more about the installation in the [Bitnami Spring Cloud Data Flow Chart GitHub repository](https://github.com/bitnami/charts/tree/master/bitnami/spring-cloud-dataflow). @@ -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-debian-10`, `2.5.1-debian-10-r1`, `2`, `2.5.1`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.5.1-debian-10-r1/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.5.1-debian-10-r2`, `2`, `2.5.1`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.5.1-debian-10-r2/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). @@ -71,11 +71,16 @@ You can use some environment variable in order to configure the deployment of sp A relational database is used to store stream and task definitions as well as the state of executed tasks. Spring Cloud Data Flow provides schemas for H2, MySQL, Oracle, PostgreSQL, Db2, and SQL Server. Use the following environment to configure the connection. -- SPRING_CLOUD_DATAFLOW_DATABASE_URL=jdbc:mariadb://mariadb-dataflow:3306/dataflow?useMysqlMetadata=true -- SPRING_CLOUD_DATAFLOW_DATABASE_USERNAME=bn_dataflow -- SPRING_CLOUD_DATAFLOW_DATABASE_PASSWORD=bn_dataflow +- SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb-dataflow:3306/dataflow?useMysqlMetadata=true +- SPRING_DATASOURCE_USERNAME=bn_dataflow +- SPRING_DATASOURCE_PASSWORD=bn_dataflow +- SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver -## Configuring advances features +If you are using MariaDB 10.2 or greater, you must also set the following environment variable: + +- spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB102Dialect + +## Configuring additional features Spring Cloud Data Flow Server offers specific set of features that can be enabled/disabled when launching. @@ -90,15 +95,17 @@ In order to deploy streams using data flow you will require [Spring Cloud Skippe ### Using RabbitMQ -- SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_HOST=rabbitmq -- SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_PORT=5672 -- SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_USERNAME=user -- SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_PASSWORD=bitnami +- spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.host=rabbitmq +- spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.port=5672 +- spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.username=user +- spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.password=bitnami ### Using Kafka -- SPRING_CLOUD_DATAFLOW_STREAM_KAFKA_URI=PLAINTEXT://kafka-broker:9092 -- SPRING_CLOUD_DATAFLOW_STREAM_ZOOKEEPER_URI=zookeeper:2181 +- spring.cloud.dataflow.applicationProperties.stream.spring.cloud.stream.kafka.binder.brokers=PLAINTEXT://kafka-broker:9092 +- spring.cloud.dataflow.applicationProperties.stream.spring.cloud.stream.kafka.streams.binder.brokers=PLAINTEXT://kafka-broker:9092 +- spring.cloud.dataflow.applicationProperties.stream.spring.cloud.stream.kafka.binder.zkNodes=zookeeper:2181 +- spring.cloud.dataflow.applicationProperties.stream.spring.cloud.stream.kafka.streams.binder.zkNodes=zookeeper:2181 Consult the [spring-cloud-dataflow Reference Documentation](https://docs.spring.io/spring-cloud-dataflow/docs/current/reference/htmlsingle/#configuration-local) to find the completed list of documentation. diff --git a/bitnami/spring-cloud-dataflow/docker-compose.yml b/bitnami/spring-cloud-dataflow/docker-compose.yml index dc9ce8fbcf46..f13d2389f6bd 100644 --- a/bitnami/spring-cloud-dataflow/docker-compose.yml +++ b/bitnami/spring-cloud-dataflow/docker-compose.yml @@ -6,21 +6,24 @@ services: restart: always environment: - SERVER_PORT=9393 - - SPRING_CLOUD_DATAFLOW_DATABASE_URL=jdbc:mariadb://mariadb-dataflow:3306/dataflow?useMysqlMetadata=true - - SPRING_CLOUD_DATAFLOW_DATABASE_USERNAME=bn_dataflow - - SPRING_CLOUD_DATAFLOW_DATABASE_PASSWORD=bn_dataflow - # enable advances features + # configuring database + - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb-dataflow:3306/dataflow?useMysqlMetadata=true + - SPRING_DATASOURCE_USERNAME=bn_dataflow + - SPRING_DATASOURCE_PASSWORD=bn_dataflow + - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver + # we use mariadb 10.2+ so we need to set hibernate dialect. + - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB102Dialect + # enable advance features - SPRING_CLOUD_DATAFLOW_FEATURES_STREAMS_ENABLED=true - SPRING_CLOUD_DATAFLOW_FEATURES_TASKS_ENABLED=true # configure dataflow stream - SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI=http://spring-cloud-skipper:7577/api - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_HOST=rabbitmq - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_PORT=5672 - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_USERNAME=user - - SPRING_CLOUD_DATAFLOW_STREAM_RABBITMQ_PASSWORD=bitnami + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.host=rabbitmq + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.port=5672 + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.username=user + - spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.password=bitnami ports: - '9393:9393' - - '9000-9099:9000-9099' depends_on: - mariadb-dataflow - spring-cloud-skipper @@ -30,11 +33,15 @@ services: restart: always environment: - SERVER_PORT=7577 - - SPRING_CLOUD_SKIPPER_DATABASE_URL=jdbc:mariadb://mariadb-skipper:3306/skipper?useMysqlMetadata=true - - SPRING_CLOUD_SKIPPER_DATABASE_USERNAME=bn_skipper - - SPRING_CLOUD_SKIPPER_DATABASE_PASSWORD=bn_skipper + - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_LOW=20000 + - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_HIGH=20100 + - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb-skipper:3306/skipper?useMysqlMetadata=true + - SPRING_DATASOURCE_USERNAME=bn_skipper + - SPRING_DATASOURCE_PASSWORD=bn_skipper + - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver + - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB102Dialect ports: - - '9100-9199:9100-9199' + - "20000-20100:20000-20100" depends_on: - mariadb-skipper - rabbitmq