From 994576e563e5b65481a9dcaa332a48bc7e9245d3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 9 Jul 2020 12:35:55 +0000 Subject: [PATCH] 12.3.0-debian-10-r54 release --- bitnami/postgresql/12/debian-10/Dockerfile | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 58 ++++++++++++++++--- bitnami/postgresql/README.md | 2 +- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/bitnami/postgresql/12/debian-10/Dockerfile b/bitnami/postgresql/12/debian-10/Dockerfile index 2b2a721dba05..ac6cf977a888 100644 --- a/bitnami/postgresql/12/debian-10/Dockerfile +++ b/bitnami/postgresql/12/debian-10/Dockerfile @@ -22,7 +22,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/postgresql/postunpack.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="12.3.0-debian-10-r53" \ + BITNAMI_IMAGE_VERSION="12.3.0-debian-10-r54" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \ diff --git a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 78c85c5ad384..d74114834f8e 100644 --- a/bitnami/postgresql/12/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/postgresql/12/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/postgresql/README.md b/bitnami/postgresql/README.md index 9faa4abc7795..e9cea445353e 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -42,7 +42,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/). -* [`12-debian-10`, `12.3.0-debian-10-r53`, `12`, `12.3.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.3.0-debian-10-r53/12/debian-10/Dockerfile) +* [`12-debian-10`, `12.3.0-debian-10-r54`, `12`, `12.3.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.3.0-debian-10-r54/12/debian-10/Dockerfile) * [`11-debian-10`, `11.8.0-debian-10-r58`, `11`, `11.8.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.8.0-debian-10-r58/11/debian-10/Dockerfile) * [`10-debian-10`, `10.13.0-debian-10-r54`, `10`, `10.13.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.13.0-debian-10-r54/10/debian-10/Dockerfile) * [`9.6-debian-10`, `9.6.18-debian-10-r56`, `9.6`, `9.6.18` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.18-debian-10-r56/9.6/debian-10/Dockerfile)