From 7877549412ff1691cda8382502c28ec974c044a2 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 24 Feb 2022 23:32:31 +0000 Subject: [PATCH] 8.11.1-debian-10-r66 release --- bitnami/solr/8/debian-10/Dockerfile | 2 +- .../solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh | 5 +++-- .../solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh | 2 +- bitnami/solr/README.md | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bitnami/solr/8/debian-10/Dockerfile b/bitnami/solr/8/debian-10/Dockerfile index 6a2399bd3d30..bf78ea4d75ec 100644 --- a/bitnami/solr/8/debian-10/Dockerfile +++ b/bitnami/solr/8/debian-10/Dockerfile @@ -22,7 +22,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/solr/postunpack.sh ENV BITNAMI_APP_NAME="solr" \ - BITNAMI_IMAGE_VERSION="8.11.1-debian-10-r65" \ + BITNAMI_IMAGE_VERSION="8.11.1-debian-10-r66" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/solr/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 1b504b1df458..21b964ff1cf4 100644 --- a/bitnami/solr/8/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/solr/8/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/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh b/bitnami/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh index 22425f1b4af0..ecd1a5d48c79 100644 --- a/bitnami/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh +++ b/bitnami/solr/8/debian-10/rootfs/opt/bitnami/scripts/solr-env.sh @@ -65,7 +65,7 @@ export SOLR_PID_DIR="${SOLR_BASE_DIR}/tmp" export SOLR_LOGS_DIR="${SOLR_BASE_DIR}/logs" export SOLR_SERVER_DIR="${SOLR_BASE_DIR}/server" -# Persitence +# Persistence export SOLR_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/solr" export SOLR_DATA_TO_PERSIST="server/solr" diff --git a/bitnami/solr/README.md b/bitnami/solr/README.md index f5da13097a45..994114fe0557 100644 --- a/bitnami/solr/README.md +++ b/bitnami/solr/README.md @@ -40,7 +40,7 @@ You can find the available configuration options in the [Environment Variables]( 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.11.1`, `8.11.1-debian-10-r65`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.11.1-debian-10-r65/8/debian-10/Dockerfile) +* [`8`, `8-debian-10`, `8.11.1`, `8.11.1-debian-10-r66`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-solr/blob/8.11.1-debian-10-r66/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/solr GitHub repo](https://github.com/bitnami/bitnami-docker-solr).