diff --git a/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile b/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile index 62ad1ab7e225..a4c294727c60 100644 --- a/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile +++ b/bitnami/harbor-adapter-clair/2/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-adapter-clair/postunpack.sh ENV BITNAMI_APP_NAME="harbor-adapter-clair" \ - BITNAMI_IMAGE_VERSION="2.4.1-debian-10-r68" \ + BITNAMI_IMAGE_VERSION="2.4.1-debian-10-r69" \ PATH="/opt/bitnami/harbor-adapter-clair/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 8080 diff --git a/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 1b504b1df458..21b964ff1cf4 100644 --- a/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/harbor-adapter-clair/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -74,8 +74,9 @@ is_dir_empty() { # boolean ######################### is_mounted_dir_empty() { - local dir="${1:?missing directory}" - + local -r path="${1:?missing directory}" + # Calculate real path in order to avoid issues with symlinks + local -r dir="$(realpath "$path")" 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/harbor-adapter-clair/README.md b/bitnami/harbor-adapter-clair/README.md index 1e30957e66c4..f1240df360ab 100644 --- a/bitnami/harbor-adapter-clair/README.md +++ b/bitnami/harbor-adapter-clair/README.md @@ -38,7 +38,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.4.1`, `2.4.1-debian-10-r68`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair/blob/2.4.1-debian-10-r68/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.4.1`, `2.4.1-debian-10-r69`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair/blob/2.4.1-debian-10-r69/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/harbor-adapter-clair GitHub repo](https://github.com/bitnami/bitnami-docker-harbor-adapter-clair).