From e597bfd2c6656fc6a807b7c0f6fbb4375ee6353e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 2 Mar 2022 04:45:14 +0000 Subject: [PATCH] 1.21.6-debian-10-r33 release --- bitnami/nginx/1.21/debian-10/Dockerfile | 8 ++++---- .../prebuildfs/opt/bitnami/.bitnami_components.json | 12 ++++++------ .../prebuildfs/opt/bitnami/scripts/libfs.sh | 5 ++--- bitnami/nginx/README.md | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/bitnami/nginx/1.21/debian-10/Dockerfile b/bitnami/nginx/1.21/debian-10/Dockerfile index e327d58d9979..f7e5bb17837b 100644 --- a/bitnami/nginx/1.21/debian-10/Dockerfile +++ b/bitnami/nginx/1.21/debian-10/Dockerfile @@ -9,9 +9,9 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libgeoip1 libpcre3 libssl1.1 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-9" --checksum 4694f01476c5a457a71f280562df45ea542bdf3f9b298ff87643a89ea365f5fb -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx" "1.21.6-3" --checksum 98f17555522a3756114507c278671d0e2cf13291c1616a2b446b62e66703902f -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-10" --checksum 97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "nginx" "1.21.6-4" --checksum 305f5b0413081f7911932bc7144c478858444e16e7ef917123f50455a490c427 +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 @@ -21,7 +21,7 @@ RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log COPY rootfs / RUN /opt/bitnami/scripts/nginx/postunpack.sh ENV BITNAMI_APP_NAME="nginx" \ - BITNAMI_IMAGE_VERSION="1.21.6-debian-10-r32" \ + BITNAMI_IMAGE_VERSION="1.21.6-debian-10-r33" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/nginx/sbin:$PATH" diff --git a/bitnami/nginx/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index a7d2baf0b283..bfbc00d64f4f 100644 --- a/bitnami/nginx/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/nginx/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,23 +1,23 @@ { "gosu": { "arch": "amd64", - "digest": "6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664", + "digest": "d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1", "distro": "debian-10", "type": "NAMI", - "version": "1.14.0-6" + "version": "1.14.0-7" }, "nginx": { "arch": "amd64", - "digest": "98f17555522a3756114507c278671d0e2cf13291c1616a2b446b62e66703902f", + "digest": "305f5b0413081f7911932bc7144c478858444e16e7ef917123f50455a490c427", "distro": "debian-10", "type": "NAMI", - "version": "1.21.6-3" + "version": "1.21.6-4" }, "render-template": { "arch": "amd64", - "digest": "4694f01476c5a457a71f280562df45ea542bdf3f9b298ff87643a89ea365f5fb", + "digest": "97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565", "distro": "debian-10", "type": "NAMI", - "version": "1.0.1-9" + "version": "1.0.1-10" } } \ No newline at end of file diff --git a/bitnami/nginx/1.21/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/nginx/1.21/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 21b964ff1cf4..1b504b1df458 100644 --- a/bitnami/nginx/1.21/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/nginx/1.21/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/nginx/README.md b/bitnami/nginx/README.md index 85ec689b503c..c4ddb9bcd148 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -48,7 +48,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/). -* [`1.21`, `1.21-debian-10`, `1.21.6`, `1.21.6-debian-10-r32`, `latest` (1.21/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.21.6-debian-10-r32/1.21/debian-10/Dockerfile) +* [`1.21`, `1.21-debian-10`, `1.21.6`, `1.21.6-debian-10-r33`, `latest` (1.21/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.21.6-debian-10-r33/1.21/debian-10/Dockerfile) * [`1.20`, `1.20-debian-10`, `1.20.2`, `1.20.2-debian-10-r100` (1.20/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.20.2-debian-10-r100/1.20/debian-10/Dockerfile) ## Get this image