From fba3e60711f8ad2b0dd33f578830c62fd6502a49 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 25 Dec 2019 04:45:52 +0000
Subject: [PATCH] 5.3.2-ol-7-r7 release

---
 bitnami/wordpress/5/ol-7/Dockerfile           |  9 +++---
 .../prebuildfs/usr/local/bin/install_packages | 29 +++++++++++++++++++
 bitnami/wordpress/README.md                   |  2 +-
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100755 bitnami/wordpress/5/ol-7/prebuildfs/usr/local/bin/install_packages

diff --git a/bitnami/wordpress/5/ol-7/Dockerfile b/bitnami/wordpress/5/ol-7/Dockerfile
index 9b27144d760e..42b5cacb708d 100644
--- a/bitnami/wordpress/5/ol-7/Dockerfile
+++ b/bitnami/wordpress/5/ol-7/Dockerfile
@@ -1,19 +1,20 @@
-FROM bitnami/oraclelinux-extras:7-r573
+FROM bitnami/oraclelinux-extras:7-r574
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
+COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages bzip2-libs cyrus-sasl-lib expat freetds-libs freetype glibc gmp gnutls keyutils-libs krb5-libs libcom_err libcurl libffi libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libmemcached libnghttp2 libpng libselinux libssh2 libstdc++ libtasn1 libtidy libxml2 libxslt ncurses-libs nettle nspr nss nss-softokn-freebl nss-util openldap openssl-libs p11-kit pcre postgresql-libs readline sqlite xz-libs zlib
-RUN bitnami-pkg unpack apache-2.4.41-3 --checksum 30ae9f98466bc180ec5b3121b000e0a8ee36ee3434d4645c7c3aa22710cc6166
+RUN bitnami-pkg unpack apache-2.4.41-4 --checksum f776f87e3c54a2ff1e13ed75de39356df465b53ac3264a94c3d6ad9252f5b682
 RUN bitnami-pkg unpack php-7.3.13-0 --checksum a51ab66c0ae1dd1503084b35380659069ba03fe2644e2034752b346c87b3c89e
 RUN bitnami-pkg install wp-cli-2.4.0-0 --checksum 877560924b4eaeba08a4e7086f85495260dce4adc4bbd3a6e876903544912b35
 RUN bitnami-pkg unpack mysql-client-10.3.21-0 --checksum 9e012f0e449a963c923c8ea7a5cc2ab2c688564ed910eaab2aef1ad70c5d8e4b
-RUN bitnami-pkg install libphp-7.3.13-1 --checksum 98cbce6668636f4104863eef78f9c29f6f97a5c44fbec102fa7ef91b4f46d459
+RUN bitnami-pkg install libphp-7.3.13-2 --checksum ddba3fba1c2c84d24cbe3545222644d6c5ccc0a3e2340b03ad28c09d0f0d0c53
 RUN bitnami-pkg unpack wordpress-5.3.2-0 --checksum 5cd69d988e488e53f547bad2469e0b21db5b8b83535203c4b93304149b811649
 
 COPY rootfs /
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="wordpress" \
-    BITNAMI_IMAGE_VERSION="5.3.2-ol-7-r6" \
+    BITNAMI_IMAGE_VERSION="5.3.2-ol-7-r7" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/wordpress/5/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/wordpress/5/ol-7/prebuildfs/usr/local/bin/install_packages
new file mode 100755
index 000000000000..370f3516f403
--- /dev/null
+++ b/bitnami/wordpress/5/ol-7/prebuildfs/usr/local/bin/install_packages
@@ -0,0 +1,29 @@
+#!/bin/sh
+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
+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 == 0 )); then
+        break
+    fi
+    if (( $n == $max )); then
+        exit $CODE
+    fi
+    echo "yum failed, retrying"
+done
+rm -r /var/cache/yum
diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md
index 3a7fb99618eb..379f9362fe2d 100644
--- a/bitnami/wordpress/README.md
+++ b/bitnami/wordpress/README.md
@@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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/).
 
 
-* [`5-ol-7`, `5.3.2-ol-7-r6` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.3.2-ol-7-r6/5/ol-7/Dockerfile)
+* [`5-ol-7`, `5.3.2-ol-7-r7` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.3.2-ol-7-r7/5/ol-7/Dockerfile)
 * [`5-debian-9`, `5.3.2-debian-9-r4`, `5`, `5.3.2`, `5.3.2-r4`, `latest` (5/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.3.2-debian-9-r4/5/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).