5.0.9-debian-10-r59 release

This commit is contained in:
Bitnami Bot 2020-06-26 22:25:21 +00:00
parent eeb7a86983
commit 830add8464
4 changed files with 28 additions and 10 deletions

View File

@ -18,7 +18,7 @@ RUN apt-get update && apt-get upgrade -y && \
COPY rootfs /
RUN /opt/bitnami/scripts/redis-sentinel/postunpack.sh
ENV BITNAMI_APP_NAME="redis-sentinel" \
BITNAMI_IMAGE_VERSION="5.0.9-debian-10-r58"
BITNAMI_IMAGE_VERSION="5.0.9-debian-10-r59"
EXPOSE 26379

View File

@ -95,6 +95,22 @@ is_file_writable() {
fi
}
########################
# Relativize a path
# arguments:
# $1 - path
# $2 - base
# returns:
# None
#########################
relativize() {
local -r path="${1:?missing path}"
local -r base="${2:?missing base}"
pushd / >/dev/null
realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
popd >/dev/null
}
########################
# Configure permisions and ownership recursively
# Globals:

View File

@ -36,16 +36,17 @@ persist_app() {
return
fi
pushd "$install_dir" >/dev/null
local file_to_persist_destination file_to_persist_destination_folder
local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder
local -r tmp_file="/tmp/perms.acl"
for file_to_persist in "${files_to_persist[@]}"; do
file_to_persist_destination="${persist_dir}/${file_to_persist}"
file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")"
file_to_persist_destination="${persist_dir}/${file_to_persist_relative}"
file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
# Get original permissions (except for the root directory, to avoid issues with volumes)
find "$file_to_persist" | grep -E -v '^\.$' | xargs getfacl -R > "$tmp_file"
find "$file_to_persist_relative" | grep -E -v '^\.$' | xargs getfacl -R > "$tmp_file"
# Copy directories to the volume
ensure_dir_exists "$file_to_persist_destination_folder"
cp -Lr --preserve=links "$file_to_persist" "$file_to_persist_destination_folder"
cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
# Restore permissions
pushd "$persist_dir" >/dev/null
if am_i_root; then
@ -84,11 +85,12 @@ restore_persisted_app() {
warn "No persisted files are configured to be restored"
return
fi
local file_to_restore_origin file_to_restore_destination
local file_to_restore_relative file_to_restore_origin file_to_restore_destination
for file_to_restore in "${files_to_restore[@]}"; do
# We use realpath to ensure that the case of '.' is covered and the directory is removed
file_to_restore_origin="$(realpath "${install_dir}/${file_to_restore}")"
file_to_restore_destination="$(realpath "${persist_dir}/${file_to_restore}")"
file_to_restore_relative="$(relativize "$file_to_restore" "$install_dir")"
# We use 'realpath --no-symlinks' to ensure that the case of '.' is covered and the directory is removed
file_to_restore_origin="$(realpath --no-symlinks "${install_dir}/${file_to_restore_relative}")"
file_to_restore_destination="$(realpath --no-symlinks "${persist_dir}/${file_to_restore_relative}")"
rm -rf "$file_to_restore_origin"
ln -sfn "$file_to_restore_destination" "$file_to_restore_origin"
done

View File

@ -43,7 +43,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
* [`6.0-debian-10`, `6.0.5-debian-10-r16`, `6.0`, `6.0.5`, `latest` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.0.5-debian-10-r16/6.0/debian-10/Dockerfile)
* [`5.0-debian-10`, `5.0.9-debian-10-r58`, `5.0`, `5.0.9` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/5.0.9-debian-10-r58/5.0/debian-10/Dockerfile)
* [`5.0-debian-10`, `5.0.9-debian-10-r59`, `5.0`, `5.0.9` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/5.0.9-debian-10-r59/5.0/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/redis-sentinel GitHub repo](https://github.com/bitnami/bitnami-docker-redis-sentinel).