From 7a0e287d39b6f540d18013bade442ffa890d5f09 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 7 Nov 2019 04:16:31 +0000
Subject: [PATCH] 1.1.0-ol-7-r85 release

---
 .../elasticsearch-exporter/1/ol-7/Dockerfile  |  7 ++++---
 .../prebuildfs/usr/local/bin/install_packages | 20 +++++++++++++++++++
 bitnami/elasticsearch-exporter/README.md      |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100755 bitnami/elasticsearch-exporter/1/ol-7/prebuildfs/usr/local/bin/install_packages

diff --git a/bitnami/elasticsearch-exporter/1/ol-7/Dockerfile b/bitnami/elasticsearch-exporter/1/ol-7/Dockerfile
index 66d533f64eb8..41568f4810ae 100644
--- a/bitnami/elasticsearch-exporter/1/ol-7/Dockerfile
+++ b/bitnami/elasticsearch-exporter/1/ol-7/Dockerfile
@@ -1,15 +1,16 @@
-FROM bitnami/oraclelinux-extras:7-r520
+FROM oraclelinux:7-slim
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
+COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates wget
+RUN install_packages ca-certificates curl gzip hostname libaio-devel procps-ng sudo tar wget which
 RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/elasticsearch-exporter-1.1.0-1-linux-x86_64-ol-7.tar.gz && \
     echo "7e4851011cf84bb5339985b1309b3900b75eeebfa951c319eed6fd9f9b0bea24  /tmp/bitnami/pkg/cache/elasticsearch-exporter-1.1.0-1-linux-x86_64-ol-7.tar.gz" | sha256sum -c - && \
     tar -zxf /tmp/bitnami/pkg/cache/elasticsearch-exporter-1.1.0-1-linux-x86_64-ol-7.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
     rm -rf /tmp/bitnami/pkg/cache/elasticsearch-exporter-1.1.0-1-linux-x86_64-ol-7.tar.gz
 
 ENV BITNAMI_APP_NAME="elasticsearch-exporter" \
-    BITNAMI_IMAGE_VERSION="1.1.0-ol-7-r84" \
+    BITNAMI_IMAGE_VERSION="1.1.0-ol-7-r85" \
     PATH="/opt/bitnami/elasticsearch-exporter/bin:$PATH"
 
 EXPOSE 9114
diff --git a/bitnami/elasticsearch-exporter/1/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/elasticsearch-exporter/1/ol-7/prebuildfs/usr/local/bin/install_packages
new file mode 100755
index 000000000000..4218ab93690a
--- /dev/null
+++ b/bitnami/elasticsearch-exporter/1/ol-7/prebuildfs/usr/local/bin/install_packages
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+set -u
+n=0
+max=2
+until [ $n -gt $max ]; do
+    set +e
+    yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@"
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "yum failed, retrying"
+    n=$(($n + 1))
+done
+rm -r /var/cache/yum
diff --git a/bitnami/elasticsearch-exporter/README.md b/bitnami/elasticsearch-exporter/README.md
index 23fc33d0f098..4772424f065b 100644
--- a/bitnami/elasticsearch-exporter/README.md
+++ b/bitnami/elasticsearch-exporter/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/).
 
 
-* [`1-ol-7`, `1.1.0-ol-7-r84` (1/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch-exporter/blob/1.1.0-ol-7-r84/1/ol-7/Dockerfile)
+* [`1-ol-7`, `1.1.0-ol-7-r85` (1/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch-exporter/blob/1.1.0-ol-7-r85/1/ol-7/Dockerfile)
 * [`1-debian-9`, `1.1.0-debian-9-r72`, `1`, `1.1.0`, `1.1.0-r72`, `latest` (1/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch-exporter/blob/1.1.0-debian-9-r72/1/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/elasticsearch-exporter GitHub repo](https://github.com/bitnami/bitnami-docker-elasticsearch-exporter).