public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

6.0.12-debian-10-r19 release

This commit is contained in:
Bitnami Bot 2021-03-29 21:13:03 +00:00
parent bf4a2adbee
commit be283024b3
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/redis-sentinel/6.0/debian-10/Dockerfile
View File

@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami
COPY rootfs /
RUN /opt/bitnami/scripts/redis-sentinel/postunpack.sh
ENV BITNAMI_APP_NAME="redis-sentinel" \
BITNAMI_IMAGE_VERSION="6.0.12-debian-10-r18"
BITNAMI_IMAGE_VERSION="6.0.12-debian-10-r19"
EXPOSE 26379

4
bitnami/redis-sentinel/6.0/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
View File

@ -106,9 +106,9 @@ is_file_writable() {
relativize() {
local -r path="${1:?missing path}"
local -r base="${2:?missing base}"
pushd "$base" >/dev/null
pushd "$base" >/dev/null || exit
realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
popd >/dev/null
popd >/dev/null || exit
}
########################

8
bitnami/redis-sentinel/6.0/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
View File

@ -35,7 +35,7 @@ persist_app() {
warn "No files are configured to be persisted"
return
fi
pushd "$install_dir" >/dev/null
pushd "$install_dir" >/dev/null || exit
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
@ -53,16 +53,16 @@ persist_app() {
ensure_dir_exists "$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
pushd "$persist_dir" >/dev/null || exit
if am_i_root; then
setfacl --restore="$tmp_file"
else
# When running as non-root, don't change ownership
setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file")
fi
popd >/dev/null
popd >/dev/null || exit
done
popd >/dev/null
popd >/dev/null || exit
rm -f "$tmp_file"
# Install the persisted files into the installation directory, via symlinks
restore_persisted_app "$@"

5
bitnami/redis-sentinel/6.0/debian-10/rootfs/opt/bitnami/scripts/libredissentinel.sh
View File

@ -42,7 +42,7 @@ redis_conf_set() {
}
########################
# Validate settings in REDIS_* env vars.
# Validate settings in REDIS_* env vars
# Globals:
# REDIS_*
# Arguments:
@ -218,8 +218,9 @@ redis_initialize() {
[[ -z "$REDIS_MASTER_USER" ]] || redis_conf_set "sentinel auth-user" "${REDIS_MASTER_SET} ${REDIS_MASTER_USER}"
[[ -z "$REDIS_SENTINEL_ANNOUNCE_IP" ]] || redis_conf_set "sentinel announce-ip" "${REDIS_SENTINEL_ANNOUNCE_IP}"
[[ -z "$REDIS_SENTINEL_ANNOUNCE_PORT" ]] || redis_conf_set "sentinel announce-port" "${REDIS_SENTINEL_ANNOUNCE_PORT}"
# Sentinel's configuration was refactored for Redis 6.2 and hostname's support now has to be enabled using a configuration parameter.
# Sentinel's configuration was refactored for Redis 6.2 and hostname's support now has to be enabled using a configuration parameter
[[ $(redis_version --major) -ge 6 ]] && [[ $(redis_version --minor) -ge 2 ]] && redis_conf_set "sentinel resolve-hostnames" "${REDIS_SENTINEL_RESOLVE_HOSTNAMES}"
[[ $(redis_version --major) -ge 6 ]] && [[ $(redis_version --minor) -ge 2 ]] && redis_conf_set "sentinel announce-hostnames" "${REDIS_SENTINEL_ANNOUNCE_HOSTNAMES}"
# Sentinel Configuration (maybe overwritten by more specific init blocks like TLS configuration)
redis_conf_set port "$REDIS_SENTINEL_PORT_NUMBER"

2
bitnami/redis-sentinel/6.0/debian-10/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh
View File

@ -32,6 +32,7 @@ redis_sentinel_env_vars=(
REDIS_SENTINEL_DOWN_AFTER_MILLISECONDS
REDIS_SENTINEL_FAILOVER_TIMEOUT
REDIS_SENTINEL_RESOLVE_HOSTNAMES
REDIS_SENTINEL_ANNOUNCE_HOSTNAMES
ALLOW_EMPTY_PASSWORD
REDIS_SENTINEL_PASSWORD
REDIS_MASTER_USER
@ -91,6 +92,7 @@ export REDIS_SENTINEL_QUORUM="${REDIS_SENTINEL_QUORUM:-2}"
export REDIS_SENTINEL_DOWN_AFTER_MILLISECONDS="${REDIS_SENTINEL_DOWN_AFTER_MILLISECONDS:-60000}"
export REDIS_SENTINEL_FAILOVER_TIMEOUT="${REDIS_SENTINEL_FAILOVER_TIMEOUT:-180000}"
export REDIS_SENTINEL_RESOLVE_HOSTNAMES="${REDIS_SENTINEL_RESOLVE_HOSTNAMES:-yes}"
export REDIS_SENTINEL_ANNOUNCE_HOSTNAMES="${REDIS_SENTINEL_ANNOUNCE_HOSTNAMES:-no}"
export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}"
export REDIS_SENTINEL_PASSWORD="${REDIS_SENTINEL_PASSWORD:-}"
export REDIS_MASTER_USER="${REDIS_MASTER_USER:-}"

2
bitnami/redis-sentinel/README.md
View File

@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
* [`6.2`, `6.2-debian-10`, `6.2.1`, `6.2.1-debian-10-r26`, `latest` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.2.1-debian-10-r26/6.2/debian-10/Dockerfile)
* [`6.0`, `6.0-debian-10`, `6.0.12`, `6.0.12-debian-10-r18` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.0.12-debian-10-r18/6.0/debian-10/Dockerfile)
* [`6.0`, `6.0-debian-10`, `6.0.12`, `6.0.12-debian-10-r19` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.0.12-debian-10-r19/6.0/debian-10/Dockerfile)
* [`5.0`, `5.0-debian-10`, `5.0.12`, `5.0.12-debian-10-r18` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/5.0.12-debian-10-r18/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).