diff --git a/bitnami/kong-ingress-controller/0/debian-10/Dockerfile b/bitnami/kong-ingress-controller/0/debian-10/Dockerfile index 9e6ee70568b7..032acfabf8fa 100644 --- a/bitnami/kong-ingress-controller/0/debian-10/Dockerfile +++ b/bitnami/kong-ingress-controller/0/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/wait-for-port-1.0.0-1-linux-amd64-debian-10.tar.gz && \ echo "07c4678654b01811f22b5bb65a8d6f8e253abd4524ebb3b78c7d3df042cf23bd /tmp/bitnami/pkg/cache/wait-for-port-1.0.0-1-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ tar -zxf /tmp/bitnami/pkg/cache/wait-for-port-1.0.0-1-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ @@ -15,7 +16,11 @@ RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives ENV BITNAMI_APP_NAME="kong-ingress-controller" \ - BITNAMI_IMAGE_VERSION="0.8.1-debian-10-r26" \ + BITNAMI_IMAGE_VERSION="0.8.1-debian-10-r27" \ + HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/kong-ingress-controller/bin:$PATH" USER 1001 diff --git a/bitnami/kong-ingress-controller/0/debian-10/docker-compose.yml b/bitnami/kong-ingress-controller/0/debian-10/docker-compose.yml index 1ada8023bb8b..2b0af631b319 100644 --- a/bitnami/kong-ingress-controller/0/debian-10/docker-compose.yml +++ b/bitnami/kong-ingress-controller/0/debian-10/docker-compose.yml @@ -1,4 +1,4 @@ version: '2' services: kong-ingress-controller: - image: bitnami/kong-ingress-controller:0 + image: docker.io/bitnami/kong-ingress-controller:0-debian-10 diff --git a/bitnami/kong-ingress-controller/0/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/kong-ingress-controller/0/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/kong-ingress-controller/0/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/kong-ingress-controller/README.md b/bitnami/kong-ingress-controller/README.md index 68c985438d9b..817d65f737f3 100644 --- a/bitnami/kong-ingress-controller/README.md +++ b/bitnami/kong-ingress-controller/README.md @@ -28,7 +28,7 @@ $ docker run --name kong-ingress-controller bitnami/kong-ingress-controller:late 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/). -* [`0-debian-10`, `0.8.1-debian-10-r26`, `0`, `0.8.1`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kong-ingress-controller/blob/0.8.1-debian-10-r26/0/debian-10/Dockerfile) +* [`0-debian-10`, `0.8.1-debian-10-r27`, `0`, `0.8.1`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kong-ingress-controller/blob/0.8.1-debian-10-r27/0/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/kong-ingress-controller GitHub repo](https://github.com/bitnami/bitnami-docker-kong-ingress-controller). diff --git a/bitnami/kong-ingress-controller/docker-compose.yml b/bitnami/kong-ingress-controller/docker-compose.yml index 1ada8023bb8b..2b0af631b319 100644 --- a/bitnami/kong-ingress-controller/docker-compose.yml +++ b/bitnami/kong-ingress-controller/docker-compose.yml @@ -1,4 +1,4 @@ version: '2' services: kong-ingress-controller: - image: bitnami/kong-ingress-controller:0 + image: docker.io/bitnami/kong-ingress-controller:0-debian-10