diff --git a/bitnami/consul-exporter/0/debian-10/Dockerfile b/bitnami/consul-exporter/0/debian-10/Dockerfile index 2d5f535b6081..b967aa2cda1e 100644 --- a/bitnami/consul-exporter/0/debian-10/Dockerfile +++ b/bitnami/consul-exporter/0/debian-10/Dockerfile @@ -1,8 +1,9 @@ FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " +COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl procps sudo unzip wget +RUN install_packages ca-certificates curl gzip procps tar wget RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/consul-exporter-0.6.0-0-linux-amd64-debian-10.tar.gz && \ echo "bb8fed8044189a6771ae1c6ec92c8483833a8f8cb5a8a67d864728bf8b8632e5 /tmp/bitnami/pkg/cache/consul-exporter-0.6.0-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ tar -zxf /tmp/bitnami/pkg/cache/consul-exporter-0.6.0-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ @@ -12,7 +13,11 @@ RUN apt-get update && apt-get upgrade -y && \ RUN ln -sf /opt/bitnami/consul-exporter/bin/consul_exporter /bin/consul_exporter ENV BITNAMI_APP_NAME="consul-exporter" \ - BITNAMI_IMAGE_VERSION="0.6.0-debian-10-r96" \ + BITNAMI_IMAGE_VERSION="0.6.0-debian-10-r97" \ + HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/consul-exporter/bin:$PATH" EXPOSE 9107 diff --git a/bitnami/consul-exporter/0/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/consul-exporter/0/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/consul-exporter/0/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/consul-exporter/README.md b/bitnami/consul-exporter/README.md index 777ca66a2500..6d6734d0bd59 100644 --- a/bitnami/consul-exporter/README.md +++ b/bitnami/consul-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/). -* [`0-debian-10`, `0.6.0-debian-10-r96`, `0`, `0.6.0`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-consul-exporter/blob/0.6.0-debian-10-r96/0/debian-10/Dockerfile) +* [`0-debian-10`, `0.6.0-debian-10-r97`, `0`, `0.6.0`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-consul-exporter/blob/0.6.0-debian-10-r97/0/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/consul-exporter GitHub repo](https://github.com/bitnami/bitnami-docker-consul-exporter).