From 14df9598be20374eb181bc77a8f1e994f01a1bcd Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 16 Jul 2020 23:45:23 +0000 Subject: [PATCH] 2.5.3-debian-10-r4 release --- .../2/debian-10/Dockerfile | 4 +- .../opt/bitnami/scripts/libwebserver.sh | 248 ++++++++++-------- bitnami/spring-cloud-dataflow/README.md | 2 +- 3 files changed, 145 insertions(+), 109 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile index 87adab0421ff..d7845af4828b 100644 --- a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile +++ b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 procps tar -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.252-4" --checksum 8e9a23094ea1ce6360b905552e55dacb1e27de4b99df7bc01ea83ea4c3fafa49 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.262-0" --checksum 7ccaf9b2abc4069482fea3d612e53c3b2a369e44c69e246aa8e8d7bddb496372 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "3.3.2-0" --checksum 50cac57ffd984455e7321d1f13380f94b6bda2a16b7e2547ba33aad347d5e9eb RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spring-cloud-dataflow" "2.5.3-0" --checksum b5fde0a0e323942522c89a7c068862d75283e3b88bbc707c53e07c8daa97ba31 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-1" --checksum 51cfb1b7fd7b05b8abd1df0278c698103a9b1a4964bdacd87ca1d5c01631d59c @@ -20,7 +20,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.5.3-debian-10-r3" \ + BITNAMI_IMAGE_VERSION="2.5.3-debian-10-r4" \ 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 d74114834f8e..4aefa86cd862 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 @@ -11,12 +11,26 @@ [[ -f "/opt/bitnami/scripts/libapache.sh" ]] && . /opt/bitnami/scripts/libapache.sh [[ -f "/opt/bitnami/scripts/libnginx.sh" ]] && . /opt/bitnami/scripts/libnginx.sh -# Load environment for all configured web servers -[[ -f "/opt/bitnami/scripts/apache-env.sh" ]] && . /opt/bitnami/scripts/apache-env.sh -[[ -f "/opt/bitnami/scripts/nginx-env.sh" ]] && . /opt/bitnami/scripts/nginx-env.sh +######################## +# Prints the list of enabled web servers +# Globals: +# WEB_SERVER_TYPE +# Arguments: +# None +# Returns: +# None +######################### +web_server_list() { + local -r -a supported_web_servers=(apache nginx) + local -a existing_web_servers=() + for web_server in "${supported_web_servers[@]}"; do + [[ -f "/opt/bitnami/scripts/${web_server}-env.sh" ]] && existing_web_servers+=("$web_server") + done + echo "${existing_web_servers[@]:-}" +} ######################## -# Prints the currently-enabled web server type +# Prints the currently-enabled web server type (only one, in order of preference) # Globals: # WEB_SERVER_TYPE # Arguments: @@ -25,7 +39,9 @@ # None ######################### web_server_type() { - echo "$WEB_SERVER_TYPE" + local -a web_servers + read -r -a web_servers <<< "$(web_server_list)" + echo "${web_servers[0]:-}" } ######################## @@ -79,6 +95,7 @@ is_web_server_running() { # None ######################### web_server_start() { + info "Starting $(web_server_type) in background" "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" } @@ -92,6 +109,7 @@ web_server_start() { # None ######################### web_server_stop() { + info "Stopping $(web_server_type)" "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" } @@ -105,6 +123,7 @@ web_server_stop() { # None ######################### web_server_restart() { + info "Restarting $(web_server_type)" "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" } @@ -118,6 +137,7 @@ web_server_restart() { # None ######################### web_server_reload() { + info "Reloading $(web_server_type) configuration" "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" } @@ -150,50 +170,54 @@ web_server_reload() { ######################## ensure_web_server_app_configuration_exists() { local app="${1:?missing app}" - local -a args=("$app") - # Validate arguments - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - # Common flags - --hosts \ - | --type \ - | --allow-remote-connections \ - | --disabled \ - | --enable-https \ - | --http-port \ - | --https-port \ - | --document-root \ - ) - args+=("$1" "${2:?missing value}") - shift - ;; - - # Specific Apache flags - --apache-additional-configuration \ - | --apache-before-vhost-configuration \ - | --apache-allow-override \ - | --apache-extra-directory-configuration \ - | --apache-move-htaccess \ - ) - [[ "$(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:?missing value}") - shift - ;; - - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac + local -a web_servers args + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + args=("$app") + # Validate arguments shift + while [[ "$#" -gt 0 ]]; do + case "$1" in + # Common flags + --hosts \ + | --type \ + | --allow-remote-connections \ + | --disabled \ + | --enable-https \ + | --http-port \ + | --https-port \ + | --document-root \ + ) + args+=("$1" "${2:?missing value}") + shift + ;; + + # Specific Apache flags + --apache-additional-configuration \ + | --apache-before-vhost-configuration \ + | --apache-allow-override \ + | --apache-extra-directory-configuration \ + | --apache-move-htaccess \ + ) + [[ "$web_server" == "apache" ]] && args+=("${1//apache-/}" "${2:?missing value}") + shift + ;; + + # Specific NGINX flags + --nginx-additional-configuration) + [[ "$web_server" == "nginx" ]] && args+=("${1//nginx-/}" "${2:?missing value}") + shift + ;; + + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + "ensure_${web_server}_app_configuration_exists" "${args[@]}" done - "ensure_$(web_server_type)_app_configuration_exists" "${args[@]}" } ######################## @@ -208,7 +232,11 @@ ensure_web_server_app_configuration_exists() { ######################## ensure_web_server_app_configuration_not_exists() { local app="${1:?missing app}" - "ensure_$(web_server_type)_app_configuration_not_exists" "$app" + local -a web_servers + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + "ensure_${web_server}_app_configuration_not_exists" "$app" + done } ######################## @@ -235,45 +263,49 @@ ensure_web_server_app_configuration_not_exists() { ######################## ensure_web_server_prefix_configuration_exists() { local app="${1:?missing app}" - local -a args=("$app") - # Validate arguments - shift - while [[ "$#" -gt 0 ]]; do - case "$1" in - # Common flags - --allow-remote-connections \ - | --document-root \ - | --prefix \ - | --type \ - ) - args+=("$1" "${2:?missing value}") - shift - ;; - - # Specific Apache flags - --apache-additional-configuration \ - | --apache-allow-override \ - | --apache-extra-directory-configuration \ - | --apache-move-htaccess \ - ) - [[ "$(web_server_type)" == "apache" ]] && args+=("${1//apache-/}" "$2") - shift - ;; - - # Specific NGINX flags - --nginx-additional-configuration) - [[ "$(web_server_type)" == "nginx" ]] && args+=("${1//nginx-/}" "$2") - shift - ;; - - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac + local -a web_servers args + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + args=("$app") + # Validate arguments shift + while [[ "$#" -gt 0 ]]; do + case "$1" in + # Common flags + --allow-remote-connections \ + | --document-root \ + | --prefix \ + | --type \ + ) + args+=("$1" "${2:?missing value}") + shift + ;; + + # Specific Apache flags + --apache-additional-configuration \ + | --apache-allow-override \ + | --apache-extra-directory-configuration \ + | --apache-move-htaccess \ + ) + [[ "$web_server" == "apache" ]] && args+=("${1//apache-/}" "$2") + shift + ;; + + # Specific NGINX flags + --nginx-additional-configuration) + [[ "$web_server" == "nginx" ]] && args+=("${1//nginx-/}" "$2") + shift + ;; + + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + "ensure_${web_server}_prefix_configuration_exists" "${args[@]}" done - "ensure_$(web_server_type)_prefix_configuration_exists" "${args[@]}" } ######################## @@ -293,29 +325,33 @@ ensure_web_server_prefix_configuration_exists() { ######################## 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 + local -a web_servers args + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + 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}_update_app_configuration" "${args[@]}" 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 1486b4d501c8..6de138ad46bd 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.3-debian-10-r3`, `2`, `2.5.3`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.5.3-debian-10-r3/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.5.3-debian-10-r4`, `2`, `2.5.3`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.5.3-debian-10-r4/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).