From 6619a511f3220f93dada2cedb01f3ee06daf7a44 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 20 Sep 2022 18:17:25 +0200 Subject: [PATCH] [bitnami/contour] Release 1.22.1-debian-11-r5 (#7180) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/contour/1.22/debian-11/Dockerfile | 4 ++-- .../1.22/debian-11/prebuildfs/usr/sbin/install_packages | 9 +++++---- bitnami/contour/README.md | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bitnami/contour/1.22/debian-11/Dockerfile b/bitnami/contour/1.22/debian-11/Dockerfile index 5152253c6eba..27b00591230d 100644 --- a/bitnami/contour/1.22/debian-11/Dockerfile +++ b/bitnami/contour/1.22/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="1.22.1-debian-11-r4" \ + org.opencontainers.image.ref.name="1.22.1-debian-11-r5" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/contour" \ org.opencontainers.image.title="contour" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf contour-1.22.1-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf contour-1.22.1-0-linux-${OS_ARCH}-debian-11.tar.gz contour-1.22.1-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN apt-get update && apt-get upgrade -y && \ - rm -r /var/lib/apt/lists /var/cache/apt/archives + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami RUN ln -s /opt/bitnami/contour/bin/contour /bin/contour diff --git a/bitnami/contour/1.22/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/contour/1.22/debian-11/prebuildfs/usr/sbin/install_packages index c9577647443b..77857a1a57f2 100755 --- a/bitnami/contour/1.22/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/contour/1.22/debian-11/prebuildfs/usr/sbin/install_packages @@ -1,9 +1,10 @@ #!/bin/sh -set -e -set -u -export DEBIAN_FRONTEND=noninteractive +set -eu + n=0 max=2 +export DEBIAN_FRONTEND=noninteractive + until [ $n -gt $max ]; do set +e ( @@ -21,4 +22,4 @@ until [ $n -gt $max ]; do echo "apt failed, retrying" n=$(($n + 1)) done -rm -r /var/lib/apt/lists /var/cache/apt/archives +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/contour/README.md b/bitnami/contour/README.md index 8dcd1b7b388e..f78b9f62e67d 100644 --- a/bitnami/contour/README.md +++ b/bitnami/contour/README.md @@ -39,7 +39,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.22`, `1.22-debian-11`, `1.22.1`, `1.22.1-debian-11-r4`, `latest` (1.22/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour/1.22/debian-11/Dockerfile) +* [`1.22`, `1.22-debian-11`, `1.22.1`, `1.22.1-debian-11-r5`, `latest` (1.22/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour/1.22/debian-11/Dockerfile) * [`1.21`, `1.21-debian-11`, `1.21.1`, `1.21.1-debian-11-r33` (1.21/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour/1.21/debian-11/Dockerfile) * [`1.20`, `1.20-debian-11`, `1.20.2`, `1.20.2-debian-11-r35` (1.20/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/contour/1.20/debian-11/Dockerfile)