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

6.2.7-debian-11-r3 release

This commit is contained in:
Bitnami Bot 2022-06-08 21:25:25 +00:00 committed by Bitnami Containers
parent bfa8132269
commit 2a41b5b052
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/libredissentinel.sh
View File

@ -37,7 +37,7 @@ redis_conf_set() {
if grep -q "^\s*$key .*" "$REDIS_SENTINEL_CONF_FILE"; then
replace_in_file "$REDIS_SENTINEL_CONF_FILE" "^\s*${key} .*" "${key} ${value}" false
else
printf '\n%s %s' "$key" "$value" >> "$REDIS_SENTINEL_CONF_FILE"
printf '\n%s %s' "$key" "$value" >>"$REDIS_SENTINEL_CONF_FILE"
fi
}
@ -131,19 +131,19 @@ redis_version() {
# Parse optional CLI flags
if [[ "$#" -gt 0 ]]; then
case "$1" in
--major)
version="1"
;;
--minor)
version="2"
;;
--patch)
version="3"
;;
*)
echo "Invalid command line flag ${1}" >&2
return 1
;;
--major)
version="1"
;;
--minor)
version="2"
;;
--patch)
version="3"
;;
*)
echo "Invalid command line flag ${1}" >&2
return 1
;;
esac
complete_version="false"
fi
@ -225,13 +225,15 @@ redis_initialize() {
redis_conf_set "sentinel resolve-hostnames" "${REDIS_SENTINEL_RESOLVE_HOSTNAMES}"
redis_conf_set "sentinel announce-hostnames" "${REDIS_SENTINEL_ANNOUNCE_HOSTNAMES}"
fi
# This directive is only available in Redis 7
[[ $(redis_version --major) -ge 7 ]] && redis_conf_set "SENTINEL master-reboot-down-after-period" "${REDIS_MASTER_SET} ${REDIS_SENTINEL_MASTER_REBOOT_DOWN_AFTER_PERIOD}"
# Sentinel Configuration (maybe overwritten by more specific init blocks like TLS configuration)
redis_conf_set port "$REDIS_SENTINEL_PORT_NUMBER"
# TLS configuration
if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then
if ([[ "$REDIS_SENTINEL_PORT_NUMBER" == "26379" ]] || [[ "$REDIS_SENTINEL_PORT_NUMBER" == "0" ]]) && [[ "$REDIS_SENTINEL_TLS_PORT_NUMBER" == "26379" ]]; then
if { [[ "$REDIS_SENTINEL_PORT_NUMBER" == "26379" ]] || [[ "$REDIS_SENTINEL_PORT_NUMBER" == "0" ]]; } && [[ "$REDIS_SENTINEL_TLS_PORT_NUMBER" == "26379" ]]; then
# If both ports are set to default values, enable TLS traffic only
redis_conf_set port 0
redis_conf_set tls-port "$REDIS_SENTINEL_TLS_PORT_NUMBER"

2
bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh
View File

@ -32,6 +32,7 @@ redis_sentinel_env_vars=(
REDIS_SENTINEL_QUORUM
REDIS_SENTINEL_DOWN_AFTER_MILLISECONDS
REDIS_SENTINEL_FAILOVER_TIMEOUT
REDIS_SENTINEL_MASTER_REBOOT_DOWN_AFTER_PERIOD
REDIS_SENTINEL_RESOLVE_HOSTNAMES
REDIS_SENTINEL_ANNOUNCE_HOSTNAMES
ALLOW_EMPTY_PASSWORD
@ -92,6 +93,7 @@ export REDIS_SENTINEL_PORT_NUMBER="${REDIS_SENTINEL_PORT_NUMBER:-$REDIS_SENTINEL
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_MASTER_REBOOT_DOWN_AFTER_PERIOD="${REDIS_SENTINEL_MASTER_REBOOT_DOWN_AFTER_PERIOD:-0}"
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}"

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

@ -42,7 +42,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
* [`7.0`, `7.0-debian-11`, `7.0.1`, `7.0.1-debian-11-r0`, `latest` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/7.0.1-debian-11-r0/7.0/debian-11/Dockerfile)
* [`6.2`, `6.2-debian-11`, `6.2.7`, `6.2.7-debian-11-r2` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.2.7-debian-11-r2/6.2/debian-11/Dockerfile)
* [`6.2`, `6.2-debian-11`, `6.2.7`, `6.2.7-debian-11-r3` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.2.7-debian-11-r3/6.2/debian-11/Dockerfile)
* [`6.0`, `6.0-debian-11`, `6.0.16`, `6.0.16-debian-11-r2` (6.0/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.0.16-debian-11-r2/6.0/debian-11/Dockerfile)
Subscribe to project updates by watching the [bitnami/redis-sentinel GitHub repo](https://github.com/bitnami/bitnami-docker-redis-sentinel).