From b2fb91c3005fcaa60650c0b863b3a62ed0bb512e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 9 Jul 2020 16:12:49 +0000 Subject: [PATCH] 2.5.2-debian-10-r15 release --- .../2/debian-10/Dockerfile | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 58 ++++++++++++++++--- bitnami/spring-cloud-dataflow/README.md | 2 +- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile index 6f70a142497a..f1d17b445362 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile +++ b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile @@ -19,7 +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.2-debian-10-r14" \ + BITNAMI_IMAGE_VERSION="2.5.2-debian-10-r15" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH" USER 1001 diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 78c85c5ad384..d74114834f8e 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -150,7 +150,7 @@ web_server_reload() { ######################## ensure_web_server_app_configuration_exists() { local app="${1:?missing app}" - local -a args=() + local -a args=("$app") # Validate arguments shift while [[ "$#" -gt 0 ]]; do @@ -165,7 +165,7 @@ ensure_web_server_app_configuration_exists() { | --https-port \ | --document-root \ ) - args+=("$1" "$2") + args+=("$1" "${2:?missing value}") shift ;; @@ -176,13 +176,13 @@ ensure_web_server_app_configuration_exists() { | --apache-extra-directory-configuration \ | --apache-move-htaccess \ ) - [[ "$(web_server_type)" == "apache" ]] && args+=("${1//apache-/}" "$2") + [[ "$(web_server_type)" == "apache" ]] && args+=("${1//apache-/}" "${2:?missing value}") shift ;; # Specific NGINX flags --nginx-additional-configuration) - [[ "$(web_server_type)" == "nginx" ]] && args+=("${1//nginx-/}" "$2") + [[ "$(web_server_type)" == "nginx" ]] && args+=("${1//nginx-/}" "${2:?missing value}") shift ;; @@ -193,7 +193,7 @@ ensure_web_server_app_configuration_exists() { esac shift done - "ensure_$(web_server_type)_app_configuration_exists" "$app" "${args[@]}" + "ensure_$(web_server_type)_app_configuration_exists" "${args[@]}" } ######################## @@ -235,7 +235,7 @@ ensure_web_server_app_configuration_not_exists() { ######################## ensure_web_server_prefix_configuration_exists() { local app="${1:?missing app}" - local -a args=() + local -a args=("$app") # Validate arguments shift while [[ "$#" -gt 0 ]]; do @@ -246,7 +246,7 @@ ensure_web_server_prefix_configuration_exists() { | --prefix \ | --type \ ) - args+=("$1" "$2") + args+=("$1" "${2:?missing value}") shift ;; @@ -273,7 +273,49 @@ ensure_web_server_prefix_configuration_exists() { esac shift done - "ensure_$(web_server_type)_prefix_configuration_exists" "$app" "${args[@]}" + "ensure_$(web_server_type)_prefix_configuration_exists" "${args[@]}" +} + +######################## +# Ensure a web server application configuration is updated with the runtime configuration (i.e. ports) +# It serves as a wrapper for the specific web server function +# Globals: +# * +# Arguments: +# $1 - App name +# Flags: +# --hosts - Hosts to enable +# --enable-https - Update HTTPS app configuration +# --http-port - HTTP port number +# --https-port - HTTPS port number +# Returns: +# true if the configuration was updated, false otherwise +######################## +web_server_update_app_configuration() { + local app="${1:?missing app}" + local -a args=("$app") + # Validate arguments + shift + while [[ "$#" -gt 0 ]]; do + case "$1" in + # Common flags + --hosts \ + | --enable-https \ + | --http-port \ + | --https-port \ + ) + args+=("$1" "${2:?missing value}") + shift + ;; + + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + "$(web_server_type)_update_app_configuration" "${args[@]}" } ######################## diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md index 3adf7685cfe4..fd93f74f4d22 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-debian-10`, `2.5.2-debian-10-r14`, `2`, `2.5.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.5.2-debian-10-r14/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.5.2-debian-10-r15`, `2`, `2.5.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.5.2-debian-10-r15/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).