From c885fecde26e75185f23b3a857c08813eaec398f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 21 Sep 2022 18:29:52 +0200 Subject: [PATCH] [bitnami/nginx-ingress-controller] Release 1.3.1-debian-11-r10 (#7303) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/nginx-ingress-controller/1/debian-11/Dockerfile | 4 ++-- .../1/debian-11/prebuildfs/usr/sbin/install_packages | 9 +++++---- bitnami/nginx-ingress-controller/README.md | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile b/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile index 6d0c264e3f39..8dc0348b4185 100644 --- a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile +++ b/bitnami/nginx-ingress-controller/1/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.3.1-debian-11-r9" \ + org.opencontainers.image.ref.name="1.3.1-debian-11-r10" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx-ingress-controller" \ org.opencontainers.image.title="nginx-ingress-controller" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf nginx-ingress-controller-1.3.1-6-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf nginx-ingress-controller-1.3.1-6-linux-${OS_ARCH}-debian-11.tar.gz nginx-ingress-controller-1.3.1-6-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 mkdir -p /opt/bitnami/nginx/conf/geoip && \ cd /opt/bitnami/nginx/conf/geoip && \ diff --git a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/install_packages index c9577647443b..77857a1a57f2 100755 --- a/bitnami/nginx-ingress-controller/1/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/nginx-ingress-controller/1/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/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index 2d8a90598f84..9a80c8939860 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -34,7 +34,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy ## Supported tags and respective `Dockerfile` links -* [`1`, `1-debian-11`, `1.3.1`, `1.3.1-debian-11-r9`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile) +* [`1`, `1-debian-11`, `1.3.1`, `1.3.1-debian-11-r10`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).