mirror of
https://github.com/bitnami/containers.git
synced 2026-10-17 15:49:13 +02:00
Fix fetching REDIS_MASTER_HOST via REDIS_SENTINEL_HOST (#29967)
[bitnami/redis] Fix fetching `REDIS_MASTER_HOST` via `REDIS_SENTINEL_HOST` Signed-off-by: Nikolai Prokoschenko <nikolai@prokoschenko.de>
This commit is contained in:
@@ -265,7 +265,7 @@ redis_configure_replication() {
|
||||
local -a sentinel_info_command=("redis-cli" "-h" "${REDIS_SENTINEL_HOST}" "-p" "${REDIS_SENTINEL_PORT_NUMBER}")
|
||||
is_boolean_yes "$REDIS_TLS_ENABLED" && sentinel_info_command+=("--tls" "--cert" "${REDIS_TLS_CERT_FILE}" "--key" "${REDIS_TLS_KEY_FILE}" "--cacert" "${REDIS_TLS_CA_FILE}")
|
||||
sentinel_info_command+=("sentinel" "get-master-addr-by-name" "${REDIS_SENTINEL_MASTER_NAME}")
|
||||
read -r -a REDIS_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}")"
|
||||
read -r -a REDIS_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}" | tr '\n' ' ')"
|
||||
REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]}
|
||||
REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]}
|
||||
fi
|
||||
|
||||
@@ -265,7 +265,7 @@ redis_configure_replication() {
|
||||
local -a sentinel_info_command=("redis-cli" "-h" "${REDIS_SENTINEL_HOST}" "-p" "${REDIS_SENTINEL_PORT_NUMBER}")
|
||||
is_boolean_yes "$REDIS_TLS_ENABLED" && sentinel_info_command+=("--tls" "--cert" "${REDIS_TLS_CERT_FILE}" "--key" "${REDIS_TLS_KEY_FILE}" "--cacert" "${REDIS_TLS_CA_FILE}")
|
||||
sentinel_info_command+=("sentinel" "get-master-addr-by-name" "${REDIS_SENTINEL_MASTER_NAME}")
|
||||
read -r -a REDIS_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}")"
|
||||
read -r -a REDIS_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}" | tr '\n' ' ')"
|
||||
REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]}
|
||||
REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]}
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user