From f56c90295997d8fe03d2f384d7af560d0c8aca1f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 11 Mar 2022 12:30:27 +0000 Subject: [PATCH] 2.8.0-debian-10-r0 release --- bitnami/kong/2/debian-10/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 8 ++++---- .../2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh | 5 ++--- .../2/debian-10/rootfs/opt/bitnami/scripts/libkong.sh | 2 +- bitnami/kong/README.md | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bitnami/kong/2/debian-10/Dockerfile b/bitnami/kong/2/debian-10/Dockerfile index f29edb84ad4d..e55f7807f7e9 100644 --- a/bitnami/kong/2/debian-10/Dockerfile +++ b/bitnami/kong/2/debian-10/Dockerfile @@ -9,8 +9,8 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libgcc1 libpcre3 libssl1.1 libyaml-0-2 perl procps tar zlib1g zlib1g-dev -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kong" "2.7.1-4" --checksum a68b0bf33c318cbdc6c461be10728de2621b9bb982e17373821311e04f5bddab -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "kong" "2.8.0-1" --checksum 3f3afcd0b2d4465d0036659dfd4ee2d67f372dddab45bbfa17c13ae842b5168f +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/kong/postunpack.sh ENV BITNAMI_APP_NAME="kong" \ - BITNAMI_IMAGE_VERSION="2.7.1-debian-10-r27" \ + BITNAMI_IMAGE_VERSION="2.8.0-debian-10-r0" \ 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/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kong/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 60863f6f2714..a95e56cc6f3e 100644 --- a/bitnami/kong/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kong/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,16 +1,16 @@ { "gosu": { "arch": "amd64", - "digest": "6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664", + "digest": "d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1", "distro": "debian-10", "type": "NAMI", - "version": "1.14.0-6" + "version": "1.14.0-7" }, "kong": { "arch": "amd64", - "digest": "a68b0bf33c318cbdc6c461be10728de2621b9bb982e17373821311e04f5bddab", + "digest": "3f3afcd0b2d4465d0036659dfd4ee2d67f372dddab45bbfa17c13ae842b5168f", "distro": "debian-10", "type": "NAMI", - "version": "2.7.1-4" + "version": "2.8.0-1" } } \ No newline at end of file diff --git a/bitnami/kong/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/kong/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 21b964ff1cf4..1b504b1df458 100644 --- a/bitnami/kong/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/kong/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -74,9 +74,8 @@ is_dir_empty() { # boolean ######################### is_mounted_dir_empty() { - local -r path="${1:?missing directory}" - # Calculate real path in order to avoid issues with symlinks - local -r dir="$(realpath "$path")" + local dir="${1:?missing directory}" + if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then true else diff --git a/bitnami/kong/2/debian-10/rootfs/opt/bitnami/scripts/libkong.sh b/bitnami/kong/2/debian-10/rootfs/opt/bitnami/scripts/libkong.sh index edc4a0dc41c9..63f0f8c95b38 100644 --- a/bitnami/kong/2/debian-10/rootfs/opt/bitnami/scripts/libkong.sh +++ b/bitnami/kong/2/debian-10/rootfs/opt/bitnami/scripts/libkong.sh @@ -140,7 +140,7 @@ kong_initialize() { kong_configure_from_environment_variables while ! kong_migrations_list_output="$(kong migrations list 2>&1)"; do - if is_boolean_yes "$KONG_MIGRATE" && [[ "$kong_migrations_list_output" =~ "Database needs bootstrapping"* ]]; then + if is_boolean_yes "$KONG_MIGRATE" && [[ "$kong_migrations_list_output" =~ "Database needs bootstrapping"* ]] || [[ "$kong_migrations_list_output" =~ "migrations available" ]]; then break fi debug "$kong_migrations_list_output" diff --git a/bitnami/kong/README.md b/bitnami/kong/README.md index 3bc5e92d5c9d..8af065f70873 100644 --- a/bitnami/kong/README.md +++ b/bitnami/kong/README.md @@ -41,7 +41,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`, `2-debian-10`, `2.7.1`, `2.7.1-debian-10-r27`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kong/blob/2.7.1-debian-10-r27/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.8.0`, `2.8.0-debian-10-r0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kong/blob/2.8.0-debian-10-r0/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/kong GitHub repo](https://github.com/bitnami/bitnami-docker-kong).