diff --git a/bitnami/tomcat/10/debian-10/Dockerfile b/bitnami/tomcat/10/debian-10/Dockerfile index f455ac6ede77..12b7971120dc 100644 --- a/bitnami/tomcat/10/debian-10/Dockerfile +++ b/bitnami/tomcat/10/debian-10/Dockerfile @@ -11,10 +11,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libssl1.1 procps tar xmlstarlet zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.14-6" --checksum 8e9d15dc54b3cf57e7f3b92efbb1e01ed07f002889034ec7703b62efb8265243 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.14-7" --checksum 900545c4f346a0ece8abf2caf64fd9d4ab7514967d4614d716bf7362b24f828b RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "10.0.17-0" --checksum 3e0549c68448dae0544d005dfab56e691dce86d3e4a1cc0897a7c5d96f890fb1 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-9" --checksum 4694f01476c5a457a71f280562df45ea542bdf3f9b298ff87643a89ea365f5fb -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 "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 @@ -23,7 +23,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh ENV BITNAMI_APP_NAME="tomcat" \ - BITNAMI_IMAGE_VERSION="10.0.17-debian-10-r0" \ + BITNAMI_IMAGE_VERSION="10.0.17-debian-10-r1" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 73c46e59fd33..e6cd3b25a7df 100644 --- a/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,24 +1,24 @@ { "gosu": { "arch": "amd64", - "digest": "6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664", + "digest": "d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1", "distro": "debian-10", "type": "NAMI", - "version": "1.14.0-6" + "version": "1.14.0-7" }, "java": { "arch": "amd64", - "digest": "8e9d15dc54b3cf57e7f3b92efbb1e01ed07f002889034ec7703b62efb8265243", + "digest": "900545c4f346a0ece8abf2caf64fd9d4ab7514967d4614d716bf7362b24f828b", "distro": "debian-10", "type": "NAMI", - "version": "11.0.14-6" + "version": "11.0.14-7" }, "render-template": { "arch": "amd64", - "digest": "4694f01476c5a457a71f280562df45ea542bdf3f9b298ff87643a89ea365f5fb", + "digest": "97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565", "distro": "debian-10", "type": "NAMI", - "version": "1.0.1-9" + "version": "1.0.1-10" }, "tomcat": { "arch": "amd64", diff --git a/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 21b964ff1cf4..1b504b1df458 100644 --- a/bitnami/tomcat/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/tomcat/10/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/tomcat/README.md b/bitnami/tomcat/README.md index 9d536ca0968f..403274cdef73 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -44,7 +44,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/). -* [`10`, `10-debian-10`, `10.0.17`, `10.0.17-debian-10-r0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.17-debian-10-r0/10/debian-10/Dockerfile) +* [`10`, `10-debian-10`, `10.0.17`, `10.0.17-debian-10-r1` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/10.0.17-debian-10-r1/10/debian-10/Dockerfile) * [`9.0`, `9.0-debian-10`, `9.0.59`, `9.0.59-debian-10-r1`, `latest` (9.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/9.0.59-debian-10-r1/9.0/debian-10/Dockerfile) * [`8.5`, `8.5-debian-10`, `8.5.76`, `8.5.76-debian-10-r0` (8.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tomcat/blob/8.5.76-debian-10-r0/8.5/debian-10/Dockerfile)