From 1beb6c0f7be3d5429d3fae6d20254dc5094744ae Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 30 Apr 2020 13:50:10 +0000
Subject: [PATCH] 2.3.4-debian-10-r63 release

---
 .../cassandra-exporter/2/debian-10/Dockerfile |  9 +++++--
 .../prebuildfs/usr/sbin/install_packages      | 24 +++++++++++++++++++
 bitnami/cassandra-exporter/README.md          |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100755 bitnami/cassandra-exporter/2/debian-10/prebuildfs/usr/sbin/install_packages

diff --git a/bitnami/cassandra-exporter/2/debian-10/Dockerfile b/bitnami/cassandra-exporter/2/debian-10/Dockerfile
index 56d0352fd2b4..ad34064cef64 100644
--- a/bitnami/cassandra-exporter/2/debian-10/Dockerfile
+++ b/bitnami/cassandra-exporter/2/debian-10/Dockerfile
@@ -1,8 +1,9 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
+COPY prebuildfs /
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl libc6 procps sudo unzip wget zlib1g
+RUN install_packages ca-certificates curl gzip libc6 procps tar wget zlib1g
 RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-11.0.7-1-linux-amd64-debian-10.tar.gz && \
     echo "e01669f15e2e655613c19eab1b8b533a720d6334766da34190a2a4939f5a0bc8  /tmp/bitnami/pkg/cache/java-11.0.7-1-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
     tar -zxf /tmp/bitnami/pkg/cache/java-11.0.7-1-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
@@ -15,7 +16,11 @@ RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 
 ENV BITNAMI_APP_NAME="cassandra-exporter" \
-    BITNAMI_IMAGE_VERSION="2.3.4-debian-10-r62" \
+    BITNAMI_IMAGE_VERSION="2.3.4-debian-10-r63" \
+    HOME="/" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux" \
     PATH="/opt/bitnami/java/bin:$PATH"
 
 EXPOSE 8080
diff --git a/bitnami/cassandra-exporter/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/cassandra-exporter/2/debian-10/prebuildfs/usr/sbin/install_packages
new file mode 100755
index 000000000000..c9577647443b
--- /dev/null
+++ b/bitnami/cassandra-exporter/2/debian-10/prebuildfs/usr/sbin/install_packages
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+set -u
+export DEBIAN_FRONTEND=noninteractive
+n=0
+max=2
+until [ $n -gt $max ]; do
+    set +e
+    (
+      apt-get update -qq &&
+      apt-get install -y --no-install-recommends "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/cassandra-exporter/README.md b/bitnami/cassandra-exporter/README.md
index d85244e88a10..68c5bd0f08bc 100644
--- a/bitnami/cassandra-exporter/README.md
+++ b/bitnami/cassandra-exporter/README.md
@@ -30,7 +30,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`2-debian-10`, `2.3.4-debian-10-r62`, `2`, `2.3.4`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra-exporter/blob/2.3.4-debian-10-r62/2/debian-10/Dockerfile)
+* [`2-debian-10`, `2.3.4-debian-10-r63`, `2`, `2.3.4`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra-exporter/blob/2.3.4-debian-10-r63/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/cassandra-exporter GitHub repo](https://github.com/bitnami/bitnami-docker-cassandra-exporter).