From b07b88c69b591b10d3c0afa7cab378761688fa7a Mon Sep 17 00:00:00 2001 From: Nikolai Prokoschenko Date: Wed, 31 May 2023 09:51:34 +0200 Subject: [PATCH] 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 --- .../redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 2 +- .../redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index ec3d1d175ca2..bd0efe6519e6 100644 --- a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -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 diff --git a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index ec3d1d175ca2..bd0efe6519e6 100644 --- a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -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