From 0e4690005df2c91f9a491e3e343e2ee030a80f09 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 8 Mar 2019 13:02:00 +0000
Subject: [PATCH] 11.2.0-debian-9-r22 release

---
 bitnami/postgresql/11/debian-9/Dockerfile    |  2 +-
 bitnami/postgresql/11/debian-9/rootfs/run.sh | 24 ++++++++++----------
 bitnami/postgresql/README.md                 |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bitnami/postgresql/11/debian-9/Dockerfile b/bitnami/postgresql/11/debian-9/Dockerfile
index d9638f1f20ad..6c8149575dd7 100644
--- a/bitnami/postgresql/11/debian-9/Dockerfile
+++ b/bitnami/postgresql/11/debian-9/Dockerfile
@@ -14,7 +14,7 @@ RUN chmod -R g+rwX /opt/bitnami/postgresql/conf/
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="11.2.0-debian-9-r21" \
+    BITNAMI_IMAGE_VERSION="11.2.0-debian-9-r22" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NAMI_PREFIX="/.nami" \
diff --git a/bitnami/postgresql/11/debian-9/rootfs/run.sh b/bitnami/postgresql/11/debian-9/rootfs/run.sh
index b81b10b97380..037090282b76 100755
--- a/bitnami/postgresql/11/debian-9/rootfs/run.sh
+++ b/bitnami/postgresql/11/debian-9/rootfs/run.sh
@@ -38,23 +38,23 @@ fi
 # allow running custom initialization scripts
 if [[ -n $(find /docker-entrypoint-initdb.d/ -type f -regex ".*\.\(sh\|sql\|sql.gz\)") ]] && [[ ! -f /bitnami/postgresql/.user_scripts_initialized ]]; then
     info "Loading user files from /docker-entrypoint-initdb.d";
-    if [[ -n $POSTGRESQL_PASSWORD ]] && [[ $POSTGRESQL_USERNAME == "postgres" ]]; then
+    if [[ -n $POSTGRESQL_PASSWORD ]]; then
         export PGPASSWORD=$POSTGRESQL_PASSWORD
     fi
-    psql=( psql --username postgres )
+    if [[ $POSTGRESQL_USERNAME == "postgres" ]]; then
+        psql=( psql -U postgres)
+    else
+        psql=( psql -U $POSTGRESQL_USERNAME -d $POSTGRESQL_DATABASE )
+    fi
     postgresqlStart &
     info "Initialization: Waiting for PostgreSQL to be available"
-    postgresql_available=0
-    for i in {1..60}; do
-        log "Attempt $i"
-        if grep "is ready to accept connections" /opt/bitnami/postgresql/logs/postgresql.log > /dev/null; then
-            postgresql_available=1
-            break
-        fi
-        sleep 10
+    retries=30
+    until "${psql[@]}" -h 127.0.0.1 -c "select 1" > /dev/null 2>&1 || [ $retries -eq 0 ]; do
+        info "Waiting for PostgreSQL server: $((retries--)) remaining attempts..."
+        sleep 2
     done
-    if [[ $postgresql_available == 0 ]]; then
-        echo "Error: PostgreSQL is not available after 600 seconds"
+    if [[ $retries == 0 ]]; then
+        echo "Error: PostgreSQL is not available after 60 seconds"
         exit 1
     fi
     tmp_file=/tmp/filelist
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index ef131a02d6a9..72bf4ce414c5 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -44,9 +44,9 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`11-ol-7`, `11.2.0-ol-7-r21` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.2.0-ol-7-r21/11/ol-7/Dockerfile)
-* [`11-debian-9`, `11.2.0-debian-9-r21`, `11`, `11.2.0`, `11.2.0-r21` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.2.0-debian-9-r21/11/debian-9/Dockerfile)
+* [`11-debian-9`, `11.2.0-debian-9-r22`, `11`, `11.2.0`, `11.2.0-r22` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.2.0-debian-9-r22/11/debian-9/Dockerfile)
 * [`10-ol-7`, `10.7.0-ol-7-r21` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.7.0-ol-7-r21/10/ol-7/Dockerfile)
-* [`10-debian-9`, `10.7.0-debian-9-r22`, `10`, `10.7.0`, `10.7.0-r22`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.7.0-debian-9-r22/10/debian-9/Dockerfile)
+* [`10-debian-9`, `10.7.0-debian-9-r21`, `10`, `10.7.0`, `10.7.0-r21`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.7.0-debian-9-r21/10/debian-9/Dockerfile)
 * [`9.6-ol-7`, `9.6.12-ol-7-r21` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.12-ol-7-r21/9.6/ol-7/Dockerfile)
 * [`9.6-debian-9`, `9.6.12-debian-9-r21`, `9.6`, `9.6.12`, `9.6.12-r21` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.12-debian-9-r21/9.6/debian-9/Dockerfile)