From 5ee4527669d082e29430348b3cf776bfcbb68393 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 7 Nov 2019 05:47:44 +0000 Subject: [PATCH] 11.5.0-centos-7-r97 release --- bitnami/postgresql/11/centos-7/Dockerfile | 4 +- .../11/centos-7/rootfs/libpostgresql.sh | 41 +++++++++++-------- bitnami/postgresql/README.md | 2 +- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/bitnami/postgresql/11/centos-7/Dockerfile b/bitnami/postgresql/11/centos-7/Dockerfile index 83d49f87ba95..97a5c71eec32 100644 --- a/bitnami/postgresql/11/centos-7/Dockerfile +++ b/bitnami/postgresql/11/centos-7/Dockerfile @@ -1,4 +1,4 @@ -FROM bitnami/centos-extras-base:7-r195 +FROM bitnami/centos-extras-base:7-r196 LABEL maintainer "Bitnami " ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ @@ -15,7 +15,7 @@ COPY rootfs / RUN yum --enablerepo base,updates,extras -y install epel-release && yum --enablerepo base,updates,extras -y update && yum --enablerepo base,updates -y install nss_wrapper RUN /postunpack.sh ENV BITNAMI_APP_NAME="postgresql" \ - BITNAMI_IMAGE_VERSION="11.5.0-centos-7-r96" \ + BITNAMI_IMAGE_VERSION="11.5.0-centos-7-r97" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ NAMI_PREFIX="/.nami" \ diff --git a/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh b/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh index f684f5041767..e6256a52cee4 100644 --- a/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh +++ b/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh @@ -122,6 +122,10 @@ export PATH="$POSTGRESQL_BIN_DIR:$PATH" export POSTGRESQL_DAEMON_USER="postgresql" export POSTGRESQL_DAEMON_GROUP="postgresql" +# Version +export POSTGRESQL_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+\.\d+\.\d+")" +export POSTGRESQL_MAJOR_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+")" + # Settings export POSTGRESQL_INIT_MAX_TIMEOUT=${POSTGRESQL_INIT_MAX_TIMEOUT:-60} export POSTGRESQL_CLUSTER_APP_NAME=${POSTGRESQL_CLUSTER_APP_NAME:-walreceiver} @@ -139,23 +143,18 @@ export POSTGRESQL_SYNCHRONOUS_COMMIT_MODE="${POSTGRESQL_SYNCHRONOUS_COMMIT_MODE: export POSTGRESQL_FSYNC="${POSTGRESQL_FSYNC:-on}" export POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-postgres}" -if [[ -z "${POSTGRESQL_INITSCRIPTS_USERNAME:-}" ]]; then - export POSTGRESQL_INITSCRIPTS_USERNAME=$POSTGRESQL_USERNAME -else - export POSTGRESQL_INITSCRIPTS_USERNAME=$POSTGRESQL_INITSCRIPTS_USERNAME -fi - -if [[ -z "${POSTGRESQL_INITSCRIPTS_PASSWORD:-}" ]]; then - export POSTGRESQL_INITSCRIPTS_PASSWORD=$POSTGRESQL_PASSWORD -else - export POSTGRESQL_INITSCRIPTS_PASSWORD=$POSTGRESQL_INITSCRIPTS_PASSWORD -fi - -# Version -export POSTGRESQL_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+\.\d+\.\d+")" -export POSTGRESQL_MAJOR_VERSION="$(echo "$BITNAMI_IMAGE_VERSION" | grep -oP "^\d+")" - +# Internal +export POSTGRESQL_FIRST_BOOT="yes" EOF + if [[ -z "${POSTGRESQL_INITSCRIPTS_USERNAME:-}" ]]; then + cat <<"EOF" +export POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_USERNAME}" +EOF + else + cat <<"EOF" +export POSTGRESQL_INITSCRIPTS_USERNAME="${POSTGRESQL_INITSCRIPTS_USERNAME}" +EOF + fi if [[ -f "${POSTGRESQL_PASSWORD_FILE:-}" ]]; then cat <<"EOF" export POSTGRESQL_PASSWORD="$(< "${POSTGRESQL_PASSWORD_FILE}")" @@ -181,6 +180,15 @@ EOF else cat <<"EOF" export POSTGRESQL_POSTGRES_PASSWORD="${POSTGRESQL_POSTGRES_PASSWORD:-}" +EOF + fi + if [[ -z "${POSTGRESQL_INITSCRIPTS_PASSWORD:-}" ]]; then + cat <<"EOF" +export POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_PASSWORD:-}" +EOF + else + cat <<"EOF" +export POSTGRESQL_INITSCRIPTS_PASSWORD="${POSTGRESQL_INITSCRIPTS_PASSWORD:-}" EOF fi } @@ -559,6 +567,7 @@ postgresql_initialize() { if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then postgresql_info "Deploying PostgreSQL with persisted data..." + export POSTGRESQL_FIRST_BOOT="no" is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters is_boolean_yes "$create_conf_file" && postgresql_configure_fsync diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index 62db59aece5f..227d82006b97 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -49,7 +49,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`12-centos-7`, `12.0.0-centos-7-r28` (12/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.0.0-centos-7-r28/12/centos-7/Dockerfile) * [`11-ol-7`, `11.5.0-ol-7-r102` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-ol-7-r102/11/ol-7/Dockerfile) * [`11-debian-9`, `11.5.0-debian-9-r84`, `11`, `11.5.0`, `11.5.0-r84`, `latest` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-debian-9-r84/11/debian-9/Dockerfile) -* [`11-centos-7`, `11.5.0-centos-7-r96` (11/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-centos-7-r96/11/centos-7/Dockerfile) +* [`11-centos-7`, `11.5.0-centos-7-r97` (11/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.5.0-centos-7-r97/11/centos-7/Dockerfile) * [`10-ol-7`, `10.10.0-ol-7-r100` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.10.0-ol-7-r100/10/ol-7/Dockerfile) * [`10-debian-9`, `10.10.0-debian-9-r88`, `10`, `10.10.0`, `10.10.0-r88` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.10.0-debian-9-r88/10/debian-9/Dockerfile) * [`10-centos-7`, `10.10.0-centos-7-r101` (10/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.10.0-centos-7-r101/10/centos-7/Dockerfile)