From 1b983987098a109f28cfbc827fa5709ead17d03d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 7 May 2020 15:03:17 +0000 Subject: [PATCH] 1.7.3-debian-10-r2 release --- bitnami/consul/1/debian-10/Dockerfile | 4 ++-- bitnami/consul/1/debian-10/docker-compose.yml | 2 +- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/consul/README.md | 2 +- bitnami/consul/docker-compose-cluster.yml | 6 ++--- bitnami/consul/docker-compose.yml | 2 +- 6 files changed, 32 insertions(+), 8 deletions(-) create mode 100755 bitnami/consul/1/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/consul/1/debian-10/Dockerfile b/bitnami/consul/1/debian-10/Dockerfile index 718a248d8d26..f31155ac33e6 100644 --- a/bitnami/consul/1/debian-10/Dockerfile +++ b/bitnami/consul/1/debian-10/Dockerfile @@ -8,7 +8,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl procps sudo unzip +RUN install_packages ca-certificates curl gzip procps tar RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-0" --checksum 63449e5ed4ece61d7bbeda0d173b68768d9fb444922b8ffa2e1042be20687142 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "consul" "1.7.3-0" --checksum 19cca55a041bad7a44e7f400e5aabd31c86ab9ee71bbc5e046008c53dbdd84b0 @@ -18,7 +18,7 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN /opt/bitnami/scripts/consul/postunpack.sh ENV BITNAMI_APP_NAME="consul" \ - BITNAMI_IMAGE_VERSION="1.7.3-debian-10-r1" \ + BITNAMI_IMAGE_VERSION="1.7.3-debian-10-r2" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/consul/bin:$PATH" EXPOSE 8300 8301 8500 8600 diff --git a/bitnami/consul/1/debian-10/docker-compose.yml b/bitnami/consul/1/debian-10/docker-compose.yml index 8bca3b755946..857ac73a3294 100644 --- a/bitnami/consul/1/debian-10/docker-compose.yml +++ b/bitnami/consul/1/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: consul: - image: bitnami/consul:1 + image: docker.io/bitnami/consul:1-debian-10 volumes: - consul_data:/bitnami/consul ports: diff --git a/bitnami/consul/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/consul/1/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/consul/1/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/README.md b/bitnami/consul/README.md index b643277b120c..7c802913c947 100644 --- a/bitnami/consul/README.md +++ b/bitnami/consul/README.md @@ -51,7 +51,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/). -* [`1-debian-10`, `1.7.3-debian-10-r1`, `1`, `1.7.3`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-consul/blob/1.7.3-debian-10-r1/1/debian-10/Dockerfile) +* [`1-debian-10`, `1.7.3-debian-10-r2`, `1`, `1.7.3`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-consul/blob/1.7.3-debian-10-r2/1/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/consul GitHub repo](https://github.com/bitnami/bitnami-docker-consul). diff --git a/bitnami/consul/docker-compose-cluster.yml b/bitnami/consul/docker-compose-cluster.yml index 1fb524913efa..5d08ea8770a5 100644 --- a/bitnami/consul/docker-compose-cluster.yml +++ b/bitnami/consul/docker-compose-cluster.yml @@ -2,7 +2,7 @@ version: '2' services: consul-node1: - image: bitnami/consul:1 + image: docker.io/bitnami/consul:1-debian-10 environment: - CONSUL_BOOTSTRAP_EXPECT=3 - CONSUL_CLIENT_LAN_ADDRESS=0.0.0.0 @@ -19,7 +19,7 @@ services: - 'consul-node1_data:/bitnami' consul-node2: - image: bitnami/consul:1 + image: docker.io/bitnami/consul:1-debian-10 environment: - CONSUL_BOOTSTRAP_EXPECT=3 - CONSUL_CLIENT_LAN_ADDRESS=0.0.0.0 @@ -30,7 +30,7 @@ services: - 'consul-node2_data:/bitnami' consul-node3: - image: bitnami/consul:1 + image: docker.io/bitnami/consul:1-debian-10 environment: - CONSUL_BOOTSTRAP_EXPECT=3 - CONSUL_CLIENT_LAN_ADDRESS=0.0.0.0 diff --git a/bitnami/consul/docker-compose.yml b/bitnami/consul/docker-compose.yml index 8bca3b755946..857ac73a3294 100644 --- a/bitnami/consul/docker-compose.yml +++ b/bitnami/consul/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: consul: - image: bitnami/consul:1 + image: docker.io/bitnami/consul:1-debian-10 volumes: - consul_data:/bitnami/consul ports: