From bcb03124cc27e450ccd3dc307fb60f1f3e572a74 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 20 Nov 2019 19:25:40 +0000
Subject: [PATCH] 10.11.0-ol-7-r5 release

---
 bitnami/postgresql/10/ol-7/Dockerfile         |  5 ++--
 .../prebuildfs/usr/local/bin/install_packages | 23 +++++++++++++------
 bitnami/postgresql/README.md                  |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/bitnami/postgresql/10/ol-7/Dockerfile b/bitnami/postgresql/10/ol-7/Dockerfile
index 26c2df7272df..08ae4b109081 100644
--- a/bitnami/postgresql/10/ol-7/Dockerfile
+++ b/bitnami/postgresql/10/ol-7/Dockerfile
@@ -10,13 +10,14 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl cyrus-sasl-lib glibc gzip hostname keyutils-libs krb5-libs libaio-devel libcom_err libedit libgcc libicu libselinux libstdc++ libuuid libxml2 libxslt ncurses-libs nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre procps-ng sqlite sudo tar which xz-libs zlib
-RUN . ./libcomponent.sh && component_unpack "postgresql" "10.11.0-0" --checksum 9f49a2447ff6f22a1d54daee72f9e7401a81ea20e85f81be9dd73f6bdce5834d
+RUN . ./libcomponent.sh && component_unpack "postgresql" "10.11.0-1" --checksum 5533cc5d14c574d000cb78cb71b140349edb13a4d8bccdb2e2dd2aabc5399567
+RUN curl --silent -L https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 > /usr/local/bin/gosu && echo 0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7 /usr/local/bin/gosu | sha256sum --check && chmod u+x /usr/local/bin/gosu && mkdir -p /opt/bitnami/licenses && curl --silent -L https://raw.githubusercontent.com/tianon/gosu/master/LICENSE > /opt/bitnami/licenses/gosu-1.11.txt
 
 COPY rootfs /
 RUN rpm -Uvh --nodeps $(repoquery --location nss_wrapper)
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="10.11.0-ol-7-r4" \
+    BITNAMI_IMAGE_VERSION="10.11.0-ol-7-r5" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NAMI_PREFIX="/.nami" \
diff --git a/bitnami/postgresql/10/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/postgresql/10/ol-7/prebuildfs/usr/local/bin/install_packages
index 4218ab93690a..370f3516f403 100755
--- a/bitnami/postgresql/10/ol-7/prebuildfs/usr/local/bin/install_packages
+++ b/bitnami/postgresql/10/ol-7/prebuildfs/usr/local/bin/install_packages
@@ -1,20 +1,29 @@
 #!/bin/sh
-set -e
-set -u
-n=0
+set -eu
+
+if [[ -n "oracle-epel-release-el7" ]]; then
+    if ! yum list installed oracle-epel-release-el7 >/dev/null 2>&1; then
+        yum -y install oracle-epel-release-el7 >/dev/null 2>&1
+        CODE=$?
+        if (( $CODE != 0 )); then
+          echo "EPEL repository installation failed"
+          exit $CODE
+        fi
+    fi
+fi
+
 max=2
-until [ $n -gt $max ]; do
+for ((n = 1 ; n <= max ; n+=1 )); do
     set +e
     yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@"
     CODE=$?
     set -e
-    if [ $CODE -eq 0 ]; then
+    if (( $CODE == 0 )); then
         break
     fi
-    if [ $n -eq $max ]; then
+    if (( $n == $max )); then
         exit $CODE
     fi
     echo "yum failed, retrying"
-    n=$(($n + 1))
 done
 rm -r /var/cache/yum
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 0ee83f88f603..6b2947f9b274 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -50,7 +50,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`11-ol-7`, `11.6.0-ol-7-r5` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.6.0-ol-7-r5/11/ol-7/Dockerfile)
 * [`11-debian-9`, `11.6.0-debian-9-r3`, `11`, `11.6.0`, `11.6.0-r3`, `latest` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.6.0-debian-9-r3/11/debian-9/Dockerfile)
 * [`11-centos-7`, `11.6.0-centos-7-r7` (11/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.6.0-centos-7-r7/11/centos-7/Dockerfile)
-* [`10-ol-7`, `10.11.0-ol-7-r4` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.11.0-ol-7-r4/10/ol-7/Dockerfile)
+* [`10-ol-7`, `10.11.0-ol-7-r5` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.11.0-ol-7-r5/10/ol-7/Dockerfile)
 * [`10-debian-9`, `10.11.0-debian-9-r6`, `10`, `10.11.0`, `10.11.0-r6` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.11.0-debian-9-r6/10/debian-9/Dockerfile)
 * [`10-centos-7`, `10.11.0-centos-7-r7` (10/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.11.0-centos-7-r7/10/centos-7/Dockerfile)
 * [`9.6-ol-7`, `9.6.16-ol-7-r4` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.16-ol-7-r4/9.6/ol-7/Dockerfile)