From bce02081eebf4254aadb79146ded6bf8712bef59 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 7 Feb 2019 15:54:09 +0000
Subject: [PATCH] 9.6.11-ol-7-r98 release

---
 bitnami/postgresql/9.6/ol-7/Dockerfile    |  2 +-
 bitnami/postgresql/9.6/ol-7/rootfs/run.sh | 14 ++++++++++++++
 bitnami/postgresql/README.md              |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/bitnami/postgresql/9.6/ol-7/Dockerfile b/bitnami/postgresql/9.6/ol-7/Dockerfile
index 30758e26d0c5..2756129ae1c6 100644
--- a/bitnami/postgresql/9.6/ol-7/Dockerfile
+++ b/bitnami/postgresql/9.6/ol-7/Dockerfile
@@ -13,7 +13,7 @@ RUN chmod -R g+rwX /opt/bitnami/postgresql/conf/
 COPY rootfs /
 RUN rpm -Uvh --nodeps $(repoquery --location nss_wrapper)
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="9.6.11-ol-7-r97" \
+    BITNAMI_IMAGE_VERSION="9.6.11-ol-7-r98" \
     NAMI_PREFIX="/.nami" \
     PATH="/opt/bitnami/postgresql/bin:$PATH" \
     POSTGRESQL_CLUSTER_APP_NAME="walreceiver" \
diff --git a/bitnami/postgresql/9.6/ol-7/rootfs/run.sh b/bitnami/postgresql/9.6/ol-7/rootfs/run.sh
index eee07500a02c..76613c745d58 100755
--- a/bitnami/postgresql/9.6/ol-7/rootfs/run.sh
+++ b/bitnami/postgresql/9.6/ol-7/rootfs/run.sh
@@ -15,6 +15,20 @@ if [[ -n $(find /docker-entrypoint-initdb.d/ -type f -regex ".*\.\(sh\|sql\|sql.
     fi
     psql=( psql --username postgres )
     nami start postgresql > /dev/null
+    info "Initialization: Waiting for PostgreSQL to be available"
+    postgresql_available=0
+    for i in {1..60}; do
+        debug "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
+    done
+    if [[ $postgresql_available == 0 ]]; then
+        echo "Error: PostgreSQL is not available after 600 seconds" 
+        exit 1
+    fi
     for f in /docker-entrypoint-initdb.d/*; do
         case "$f" in
             *.sh)
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index c8621057b3b1..fe4925c28b3a 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -45,9 +45,9 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`11-ol-7`, `11.1.0-ol-7-r93` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.1.0-ol-7-r93/11/ol-7/Dockerfile)
 * [`11-debian-9`, `11.1.0-debian-9-r74`, `11`, `11.1.0`, `11.1.0-r74` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.1.0-debian-9-r74/11/debian-9/Dockerfile)
-* [`10-ol-7`, `10.6.0-ol-7-r98` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.6.0-ol-7-r98/10/ol-7/Dockerfile)
+* [`10-ol-7`, `10.6.0-ol-7-r97` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.6.0-ol-7-r97/10/ol-7/Dockerfile)
 * [`10-debian-9`, `10.6.0-debian-9-r80`, `10`, `10.6.0`, `10.6.0-r80`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.6.0-debian-9-r80/10/debian-9/Dockerfile)
-* [`9.6-ol-7`, `9.6.11-ol-7-r97` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.11-ol-7-r97/9.6/ol-7/Dockerfile)
+* [`9.6-ol-7`, `9.6.11-ol-7-r98` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.11-ol-7-r98/9.6/ol-7/Dockerfile)
 * [`9.6-debian-9`, `9.6.11-debian-9-r78`, `9.6`, `9.6.11`, `9.6.11-r78` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.11-debian-9-r78/9.6/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).