From 98d5e93ddeb59b2c8de47126749b20f64caa1174 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 8 Jun 2020 21:31:32 +0000 Subject: [PATCH] 1.5.0-debian-10-r3 release --- bitnami/contour/1/debian-10/Dockerfile | 9 +++++-- .../contour/1/debian-10/docker-compose.yml | 3 ++- .../opt/bitnami/licenses/licenses.txt | 3 +++ .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/contour/README.md | 2 +- bitnami/contour/docker-compose.yml | 3 ++- 6 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 bitnami/contour/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt create mode 100755 bitnami/contour/1/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/contour/1/debian-10/Dockerfile b/bitnami/contour/1/debian-10/Dockerfile index 4e146474e586..58f6646b84f3 100644 --- a/bitnami/contour/1/debian-10/Dockerfile +++ b/bitnami/contour/1/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 libc6 procps sudo unzip wget +RUN install_packages ca-certificates curl gzip libc6 procps tar wget RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/contour-1.5.0-0-linux-amd64-debian-10.tar.gz && \ echo "d35dcb4cc5774d3fc179d9cfa3c79263dcacf6e5de7a9767be66dddcc5434095 /tmp/bitnami/pkg/cache/contour-1.5.0-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ tar -zxf /tmp/bitnami/pkg/cache/contour-1.5.0-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ @@ -11,7 +12,11 @@ RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives ENV BITNAMI_APP_NAME="contour" \ - BITNAMI_IMAGE_VERSION="1.5.0-debian-10-r2" \ + BITNAMI_IMAGE_VERSION="1.5.0-debian-10-r3" \ + HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/contour/bin:$PATH" USER 1001 diff --git a/bitnami/contour/1/debian-10/docker-compose.yml b/bitnami/contour/1/debian-10/docker-compose.yml index 7a058cd5c4aa..674156436a2b 100644 --- a/bitnami/contour/1/debian-10/docker-compose.yml +++ b/bitnami/contour/1/debian-10/docker-compose.yml @@ -1,7 +1,8 @@ version: '2' + services: contour: - image: bitnami/contour:1 + image: docker.io/bitnami/contour:1-debian-10 volumes: - contour_data:/bitnami/contour volumes: diff --git a/bitnami/contour/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/contour/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/contour/1/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,3 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/nami/COPYING +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/contour/1/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/contour/1/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/contour/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/contour/README.md b/bitnami/contour/README.md index f6c7222c52ba..cb0b877b5e0f 100644 --- a/bitnami/contour/README.md +++ b/bitnami/contour/README.md @@ -37,7 +37,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/containers/how-to/understand-rolling-tags-containers/). -* [`1-debian-10`, `1.5.0-debian-10-r2`, `1`, `1.5.0`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-contour/blob/1.5.0-debian-10-r2/1/debian-10/Dockerfile) +* [`1-debian-10`, `1.5.0-debian-10-r3`, `1`, `1.5.0`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-contour/blob/1.5.0-debian-10-r3/1/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/contour GitHub repo](https://github.com/bitnami/bitnami-docker-contour). diff --git a/bitnami/contour/docker-compose.yml b/bitnami/contour/docker-compose.yml index 7a058cd5c4aa..674156436a2b 100644 --- a/bitnami/contour/docker-compose.yml +++ b/bitnami/contour/docker-compose.yml @@ -1,7 +1,8 @@ version: '2' + services: contour: - image: bitnami/contour:1 + image: docker.io/bitnami/contour:1-debian-10 volumes: - contour_data:/bitnami/contour volumes: