diff --git a/bitnami/kong/2/debian-10/Dockerfile b/bitnami/kong/2/debian-10/Dockerfile index 66fb1c6e0b31..9a7b527444ad 100644 --- a/bitnami/kong/2/debian-10/Dockerfile +++ b/bitnami/kong/2/debian-10/Dockerfile @@ -8,7 +8,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl libc6 libgcc1 libpcre3 libssl1.1 libyaml-0-2 perl procps sudo unzip zlib1g +RUN install_packages ca-certificates curl gzip libc6 libgcc1 libpcre3 libssl1.1 libyaml-0-2 perl procps tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kong" "2.0.4-6" --checksum bd1ebd44eadd067e3e7399c0e11168253452d175ef19e8e0c540d8ae11380d54 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-0" --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c RUN apt-get update && apt-get upgrade -y && \ @@ -17,7 +17,7 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / RUN /opt/bitnami/scripts/kong/postunpack.sh ENV BITNAMI_APP_NAME="kong" \ - BITNAMI_IMAGE_VERSION="2.0.4-debian-10-r26" \ + BITNAMI_IMAGE_VERSION="2.0.4-debian-10-r27" \ PATH="/opt/bitnami/kong/bin:/opt/bitnami/kong/openresty/bin:/opt/bitnami/kong/openresty/luajit/bin:/opt/bitnami/kong/openresty/nginx/sbin:/opt/bitnami/common/bin:$PATH" EXPOSE 8000 8001 8443 8444 diff --git a/bitnami/kong/2/debian-10/docker-compose.yml b/bitnami/kong/2/debian-10/docker-compose.yml index c1c4b2c620ad..9966483c46d6 100644 --- a/bitnami/kong/2/debian-10/docker-compose.yml +++ b/bitnami/kong/2/debian-10/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: postgresql: - image: bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:11-debian-10 volumes: - postgresql_data:/bitnami/postgresql environment: @@ -9,7 +9,7 @@ services: - POSTGRESQL_PASSWORD=bitnami - POSTGRESQL_DATABASE=kong kong: - image: bitnami/kong:2 + image: docker.io/bitnami/kong:2-debian-10 ports: - 8000:8000 - 8443:8443 diff --git a/bitnami/kong/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/kong/2/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/kong/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/kong/README.md b/bitnami/kong/README.md index 6ccc84d83712..b6c30b1a3b9e 100644 --- a/bitnami/kong/README.md +++ b/bitnami/kong/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/tutorials/understand-rolling-tags-containers/). -* [`2-debian-10`, `2.0.4-debian-10-r26`, `2`, `2.0.4`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kong/blob/2.0.4-debian-10-r26/2/debian-10/Dockerfile) +* [`2-debian-10`, `2.0.4-debian-10-r27`, `2`, `2.0.4`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kong/blob/2.0.4-debian-10-r27/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/kong GitHub repo](https://github.com/bitnami/bitnami-docker-kong). diff --git a/bitnami/kong/docker-compose-cassandra.yml b/bitnami/kong/docker-compose-cassandra.yml index 2aefd1ea4f3f..7fc4a8137824 100644 --- a/bitnami/kong/docker-compose-cassandra.yml +++ b/bitnami/kong/docker-compose-cassandra.yml @@ -1,7 +1,7 @@ version: '2' services: cassandra: - image: bitnami/cassandra:3 + image: docker.io/bitnami/cassandra:3-debian-10 volumes: - cassandra_data:/bitnami environment: @@ -11,7 +11,7 @@ services: - CASSANDRA_PASSWORD=kong - CASSANDRA_PASSWORD_SEEDER=yes kong: - image: bitnami/kong:1 + image: docker.io/bitnami/kong:2-debian-10 ports: - 8000:8000 - 8443:8443 diff --git a/bitnami/kong/docker-compose-cluster.yml b/bitnami/kong/docker-compose-cluster.yml index 496703019eb1..0e335432513c 100644 --- a/bitnami/kong/docker-compose-cluster.yml +++ b/bitnami/kong/docker-compose-cluster.yml @@ -1,7 +1,7 @@ version: '2' services: cassandra: - image: bitnami/cassandra:3 + image: docker.io/bitnami/cassandra:3-debian-10 volumes: - cassandra_data:/bitnami environment: @@ -15,7 +15,7 @@ services: - MAX_HEAP_SIZE=2G - HEAP_NEWSIZE=200M cassandra2: - image: bitnami/cassandra:3 + image: docker.io/bitnami/cassandra:3-debian-10 volumes: - cassandra2_data:/bitnami environment: @@ -28,7 +28,7 @@ services: - MAX_HEAP_SIZE=2G - HEAP_NEWSIZE=200M kong: - image: bitnami/kong:1 + image: docker.io/bitnami/kong:2-debian-10 ports: - 18000:8000 - 18443:8443 @@ -41,7 +41,7 @@ services: # If in doubt, set to the amount of CPU cores divided by the number of Kong/Cassandra nodes in the machine - KONG_NGINX_WORKER_PROCESSES=2 kong2: - image: bitnami/kong:1 + image: docker.io/bitnami/kong:2-debian-10 ports: - 28000:8000 - 28443:8443 diff --git a/bitnami/kong/docker-compose.yml b/bitnami/kong/docker-compose.yml index c1c4b2c620ad..9966483c46d6 100644 --- a/bitnami/kong/docker-compose.yml +++ b/bitnami/kong/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: postgresql: - image: bitnami/postgresql:11 + image: docker.io/bitnami/postgresql:11-debian-10 volumes: - postgresql_data:/bitnami/postgresql environment: @@ -9,7 +9,7 @@ services: - POSTGRESQL_PASSWORD=bitnami - POSTGRESQL_DATABASE=kong kong: - image: bitnami/kong:2 + image: docker.io/bitnami/kong:2-debian-10 ports: - 8000:8000 - 8443:8443