From 5e7511217caa4c8cfb3eca34f0929062c84a5f2a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 13 May 2020 01:07:18 +0000 Subject: [PATCH] 2.1.6-debian-10-r44 release --- bitnami/nats/2/debian-10/Dockerfile | 9 +++++-- bitnami/nats/2/debian-10/docker-compose.yml | 2 +- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/nats/README.md | 2 +- bitnami/nats/docker-compose.yml | 2 +- 5 files changed, 34 insertions(+), 5 deletions(-) create mode 100755 bitnami/nats/2/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/nats/2/debian-10/Dockerfile b/bitnami/nats/2/debian-10/Dockerfile index 286a9cdb8dd8..3205bc40b543 100644 --- a/bitnami/nats/2/debian-10/Dockerfile +++ b/bitnami/nats/2/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/nats-2.1.6-0-linux-amd64-debian-10.tar.gz && \ echo "4421af62a3c31a69885bd7affd05ee745eabb3f26171210a0c431da365b7c453 /tmp/bitnami/pkg/cache/nats-2.1.6-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ tar -zxf /tmp/bitnami/pkg/cache/nats-2.1.6-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ @@ -13,7 +14,11 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN chown -R 1001:root /opt/bitnami/nats && chmod g+rwX /opt/bitnami/nats ENV BITNAMI_APP_NAME="nats" \ - BITNAMI_IMAGE_VERSION="2.1.6-debian-10-r43" \ + BITNAMI_IMAGE_VERSION="2.1.6-debian-10-r44" \ + HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/nats/bin:$PATH" EXPOSE 4222 6222 8222 diff --git a/bitnami/nats/2/debian-10/docker-compose.yml b/bitnami/nats/2/debian-10/docker-compose.yml index 3467ebdb39dc..ca24a647a7c7 100644 --- a/bitnami/nats/2/debian-10/docker-compose.yml +++ b/bitnami/nats/2/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: nats: - image: bitnami/nats:2 + image: docker.io/bitnami/nats:2-debian-10 ports: - '4222:4222' - '6222:6222' diff --git a/bitnami/nats/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/nats/2/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/nats/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/nats/README.md b/bitnami/nats/README.md index 30cec6b5dc30..7bae674e510c 100644 --- a/bitnami/nats/README.md +++ b/bitnami/nats/README.md @@ -45,7 +45,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.1.6-debian-10-r43`, `2`, `2.1.6`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nats/blob/2.1.6-debian-10-r43/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.1.6-debian-10-r44`, `2`, `2.1.6`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nats/blob/2.1.6-debian-10-r44/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/nats GitHub repo](https://github.com/bitnami/bitnami-docker-nats). diff --git a/bitnami/nats/docker-compose.yml b/bitnami/nats/docker-compose.yml index 3467ebdb39dc..ca24a647a7c7 100644 --- a/bitnami/nats/docker-compose.yml +++ b/bitnami/nats/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: nats: - image: bitnami/nats:2 + image: docker.io/bitnami/nats:2-debian-10 ports: - '4222:4222' - '6222:6222'