From 7d050deb6605c72fe9742a99be0ea45789ab8655 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 17 Sep 2019 03:43:51 +0000 Subject: [PATCH] 11.5.0-ol-7-r44 release --- bitnami/postgresql/11/ol-7/Dockerfile | 4 +-- .../11/ol-7/rootfs/libpostgresql.sh | 34 ++++++++----------- bitnami/postgresql/README.md | 2 +- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/bitnami/postgresql/11/ol-7/Dockerfile b/bitnami/postgresql/11/ol-7/Dockerfile index 1fc155ed91fe..31f31d876509 100644 --- a/bitnami/postgresql/11/ol-7/Dockerfile +++ b/bitnami/postgresql/11/ol-7/Dockerfile @@ -1,4 +1,4 @@ -FROM bitnami/oraclelinux-extras-base:7-r419 +FROM bitnami/oraclelinux-extras-base:7-r420 LABEL maintainer "Bitnami " ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ @@ -15,7 +15,7 @@ COPY rootfs / RUN rpm -Uvh --nodeps $(repoquery --location nss_wrapper) RUN /postunpack.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="11.5.0-ol-7-r43" \ + BITNAMI_IMAGE_VERSION="11.5.0-ol-7-r44" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NAMI_PREFIX="/.nami" \ diff --git a/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh b/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh index a8df3ef16aa2..7518880f724e 100644 --- a/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh +++ b/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh @@ -178,58 +178,54 @@ EOF ######################### postgresql_validate() { postgresql_info "Validating settings in POSTGRESQL_* env vars.." + local error_code=0 # Auxiliary functions + print_validation_error() { + postgresql_error "$1" + error_code=1 + } + empty_password_enabled_warn() { postgresql_warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." } empty_password_error() { - postgresql_error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development." - exit 1 + print_validation_error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development." } if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then empty_password_enabled_warn else if [[ -z "$POSTGRESQL_PASSWORD" ]]; then empty_password_error "POSTGRESQL_PASSWORD" - exit 1 fi if (( ${#POSTGRESQL_PASSWORD} > 100 )); then - postgresql_error "The password cannot be longer than 100 characters. Set the environment variable POSTGRESQL_PASSWORD with a shorter value" - exit 1 + print_validation_error "The password cannot be longer than 100 characters. Set the environment variable POSTGRESQL_PASSWORD with a shorter value" fi if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ -z "$POSTGRESQL_PASSWORD" ]]; then empty_password_error "POSTGRESQL_PASSWORD" - exit 1 fi if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ "$POSTGRESQL_USERNAME" != "postgres" ]] && [[ -n "$POSTGRESQL_PASSWORD" ]] && [[ -z "$POSTGRESQL_DATABASE" ]]; then - postgresql_error "In order to use a custom PostgreSQL user you need to set the environment variable POSTGRESQL_DATABASE as well" - exit 1 + print_validation_error "In order to use a custom PostgreSQL user you need to set the environment variable POSTGRESQL_DATABASE as well" fi fi if [[ -n "$POSTGRESQL_REPLICATION_MODE" ]]; then if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then if (( POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS < 0 )); then - postgresql_error "The number of synchronous replicas cannot be less than 0. Set the environment variable POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS" - exit 1 + print_validation_error "The number of synchronous replicas cannot be less than 0. Set the environment variable POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS" fi elif [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]]; then if [[ -z "$POSTGRESQL_MASTER_HOST" ]]; then - postgresql_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_MASTER_HOST. Use it to indicate where the Master node is running" - exit 1 + print_validation_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_MASTER_HOST. Use it to indicate where the Master node is running" fi if [[ -z "$POSTGRESQL_REPLICATION_USER" ]]; then - postgresql_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_REPLICATION_USER. Make sure that the master also has this parameter set" - exit 1 + print_validation_error "Slave replication mode chosen without setting the environment variable POSTGRESQL_REPLICATION_USER. Make sure that the master also has this parameter set" fi else - postgresql_error "Invalid replication mode. Available options are 'master/slave'" - exit 1 + print_validation_error "Invalid replication mode. Available options are 'master/slave'" fi # Common replication checks if [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && [[ -z "$POSTGRESQL_REPLICATION_PASSWORD" ]]; then empty_password_error "POSTGRESQL_REPLICATION_PASSWORD" - exit 1 fi else if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then @@ -237,14 +233,14 @@ postgresql_validate() { else if [[ -z "$POSTGRESQL_PASSWORD" ]]; then empty_password_error "POSTGRESQL_PASSWORD" - exit 1 fi if [[ -n "$POSTGRESQL_USERNAME" ]] && [[ -z "$POSTGRESQL_PASSWORD" ]]; then empty_password_error "POSTGRESQL_PASSWORD" - exit 1 fi fi fi + + [[ "$error_code" -eq 0 ]] || exit "$error_code" } ######################## diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index c9f49eeed871..6ba65ead08f1 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -44,7 +44,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/containers/how-to/understand-rolling-tags-containers/). -* [`11-ol-7`, `11.5.0-ol-7-r43` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-ol-7-r43/11/ol-7/Dockerfile) +* [`11-ol-7`, `11.5.0-ol-7-r44` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-ol-7-r44/11/ol-7/Dockerfile) * [`11-debian-9`, `11.5.0-debian-9-r41`, `11`, `11.5.0`, `11.5.0-r41`, `latest` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-debian-9-r41/11/debian-9/Dockerfile) * [`11-centos-7`, `11.5.0-centos-7-r40` (11/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-centos-7-r40/11/centos-7/Dockerfile) * [`10-ol-7`, `10.10.0-ol-7-r42` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.10.0-ol-7-r42/10/ol-7/Dockerfile)