diff --git a/bitnami/grafana/8/debian-10/Dockerfile b/bitnami/grafana/8/debian-10/Dockerfile index c6415f66ab41..0b033bdaa8f9 100644 --- a/bitnami/grafana/8/debian-10/Dockerfile +++ b/bitnami/grafana/8/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 libfontconfig procps tar -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "grafana" "8.4.2-0" --checksum 56bd5b4f6c4208f850f8da177285a9c4b9a65ecfd0d9c0bd9981be15012f7c47 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "grafana" "8.4.2-1" --checksum 455a56940c0d7b885ef7ff853539cc46378ccb2f70eebce88e8b7ca9ad399ebc +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/grafana/postunpack.sh ENV BITNAMI_APP_NAME="grafana" \ - BITNAMI_IMAGE_VERSION="8.4.2-debian-10-r4" \ + BITNAMI_IMAGE_VERSION="8.4.2-debian-10-r5" \ PATH="/opt/bitnami/grafana/bin:/opt/bitnami/common/bin:$PATH" EXPOSE 3000 diff --git a/bitnami/grafana/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 2cb4995ef36b..9a99b0713423 100644 --- a/bitnami/grafana/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/grafana/8/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" }, "grafana": { "arch": "amd64", - "digest": "56bd5b4f6c4208f850f8da177285a9c4b9a65ecfd0d9c0bd9981be15012f7c47", + "digest": "455a56940c0d7b885ef7ff853539cc46378ccb2f70eebce88e8b7ca9ad399ebc", "distro": "debian-10", "type": "NAMI", - "version": "8.4.2-0" + "version": "8.4.2-1" } } \ No newline at end of file diff --git a/bitnami/grafana/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/grafana/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 21b964ff1cf4..1b504b1df458 100644 --- a/bitnami/grafana/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/grafana/8/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/grafana/README.md b/bitnami/grafana/README.md index 3d30fd01b569..7c905bb96e94 100644 --- a/bitnami/grafana/README.md +++ b/bitnami/grafana/README.md @@ -40,7 +40,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/). -* [`8`, `8-debian-10`, `8.4.2`, `8.4.2-debian-10-r4`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/8.4.2-debian-10-r4/8/debian-10/Dockerfile) +* [`8`, `8-debian-10`, `8.4.2`, `8.4.2-debian-10-r5`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/8.4.2-debian-10-r5/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/grafana GitHub repo](https://github.com/bitnami/bitnami-docker-grafana).