From b33faea979e76f78902c3cb633d2dc60d3317289 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 21 Nov 2019 02:51:36 +0000
Subject: [PATCH] 6.4.4-ol-7-r19 release

---
 bitnami/grafana/6/ol-7/Dockerfile             |  2 +-
 .../prebuildfs/usr/local/bin/install_packages | 23 +++++++++++++------
 bitnami/grafana/README.md                     |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/bitnami/grafana/6/ol-7/Dockerfile b/bitnami/grafana/6/ol-7/Dockerfile
index 1f5bd4565ed3..8805d14a86b0 100644
--- a/bitnami/grafana/6/ol-7/Dockerfile
+++ b/bitnami/grafana/6/ol-7/Dockerfile
@@ -13,7 +13,7 @@ RUN mkdir -p /opt/bitnami/grafana/data/ /opt/bitnami/grafana/logs/ && chmod g+rw
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="grafana" \
-    BITNAMI_IMAGE_VERSION="6.4.4-ol-7-r18" \
+    BITNAMI_IMAGE_VERSION="6.4.4-ol-7-r19" \
     PATH="/opt/bitnami/grafana/bin:$PATH"
 
 EXPOSE 3000
diff --git a/bitnami/grafana/6/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/grafana/6/ol-7/prebuildfs/usr/local/bin/install_packages
index 4218ab93690a..370f3516f403 100755
--- a/bitnami/grafana/6/ol-7/prebuildfs/usr/local/bin/install_packages
+++ b/bitnami/grafana/6/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/grafana/README.md b/bitnami/grafana/README.md
index d42453100057..bfa7215a3151 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -46,7 +46,7 @@ $ kubectl apply -f test.yaml
 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/).
 
 
-* [`6-ol-7`, `6.4.4-ol-7-r18` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.4.4-ol-7-r18/6/ol-7/Dockerfile)
+* [`6-ol-7`, `6.4.4-ol-7-r19` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.4.4-ol-7-r19/6/ol-7/Dockerfile)
 * [`6-debian-9`, `6.4.4-debian-9-r10`, `6`, `6.4.4`, `6.4.4-r10`, `latest` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.4.4-debian-9-r10/6/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/grafana GitHub repo](https://github.com/bitnami/bitnami-docker-grafana).