diff --git a/bitnami/java/17/debian-10/Dockerfile b/bitnami/java/17/debian-10/Dockerfile index c6f71daec758..8a17db97dea8 100644 --- a/bitnami/java/17/debian-10/Dockerfile +++ b/bitnami/java/17/debian-10/Dockerfile @@ -10,8 +10,8 @@ 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 libsqlite3-dev libssl-dev locales procps tar wget zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "17.0.2-9" --checksum dc8c7f47a531fff0ffbf05652ee5c4d6ea5eedb74c1d09d98a87bf738d89b287 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "17.0.2-10" --checksum 70dbc5d64a8ae02f4898685ccaf993e0469ad804c87961e1e3b1a41046292a39 +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 localedef -c -f UTF-8 -i en_US en_US.UTF-8 @@ -27,7 +27,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/locales/add-extra-locales.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV BITNAMI_APP_NAME="java" \ - BITNAMI_IMAGE_VERSION="17.0.2-debian-10-r36" \ + BITNAMI_IMAGE_VERSION="17.0.2-debian-10-r37" \ JAVA_HOME="/opt/bitnami/java" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ diff --git a/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 1425dd8ca871..5b76cb83b997 100644 --- a/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/java/17/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" }, "java": { "arch": "amd64", - "digest": "dc8c7f47a531fff0ffbf05652ee5c4d6ea5eedb74c1d09d98a87bf738d89b287", + "digest": "70dbc5d64a8ae02f4898685ccaf993e0469ad804c87961e1e3b1a41046292a39", "distro": "debian-10", "type": "NAMI", - "version": "17.0.2-9" + "version": "17.0.2-10" } } \ No newline at end of file diff --git a/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 21b964ff1cf4..1b504b1df458 100644 --- a/bitnami/java/17/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/java/17/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/java/README.md b/bitnami/java/README.md index f886f397136f..19447aef2516 100644 --- a/bitnami/java/README.md +++ b/bitnami/java/README.md @@ -38,7 +38,7 @@ $ docker-compose up -d 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/). -* [`17`, `17-debian-10`, `17.0.2`, `17.0.2-debian-10-r36`, `latest` (17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.2-debian-10-r36/17/debian-10/Dockerfile) +* [`17`, `17-debian-10`, `17.0.2`, `17.0.2-debian-10-r37`, `latest` (17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.2-debian-10-r37/17/debian-10/Dockerfile) * [`11`, `11-debian-10`, `11.0.14`, `11.0.14-debian-10-r39` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.14-debian-10-r39/11/debian-10/Dockerfile) * [`1.8`, `1.8-debian-10`, `1.8.322`, `1.8.322-debian-10-r38` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.322-debian-10-r38/1.8/debian-10/Dockerfile)