From 166d6aa3e1f6554803ff95597430df2fc79cc600 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 2 Jun 2022 16:32:51 +0000
Subject: [PATCH] 6.2.7-debian-10-r34 release

---
 .../rootfs/opt/bitnami/scripts/libredissentinel.sh          | 6 ++++--
 bitnami/redis-sentinel/README.md                            | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bitnami/redis-sentinel/6.2/debian-10/rootfs/opt/bitnami/scripts/libredissentinel.sh b/bitnami/redis-sentinel/6.2/debian-10/rootfs/opt/bitnami/scripts/libredissentinel.sh
index a91d62163ff1..cef6814c6f0b 100644
--- a/bitnami/redis-sentinel/6.2/debian-10/rootfs/opt/bitnami/scripts/libredissentinel.sh
+++ b/bitnami/redis-sentinel/6.2/debian-10/rootfs/opt/bitnami/scripts/libredissentinel.sh
@@ -221,8 +221,10 @@ redis_initialize() {
         [[ -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
-        [[ $(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}"
+        if { [[ $(redis_version --major) -ge 6 ]] && [[ $(redis_version --minor) -ge 2 ]]; } || [[ $(redis_version --major) -ge 7 ]]; then
+            redis_conf_set "sentinel resolve-hostnames" "${REDIS_SENTINEL_RESOLVE_HOSTNAMES}"
+            redis_conf_set "sentinel announce-hostnames" "${REDIS_SENTINEL_ANNOUNCE_HOSTNAMES}"
+        fi
 
         # Sentinel Configuration (maybe overwritten by more specific init blocks like TLS configuration)
         redis_conf_set port "$REDIS_SENTINEL_PORT_NUMBER"
diff --git a/bitnami/redis-sentinel/README.md b/bitnami/redis-sentinel/README.md
index 3294cde4481b..e276083fe35f 100644
--- a/bitnami/redis-sentinel/README.md
+++ b/bitnami/redis-sentinel/README.md
@@ -42,7 +42,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`7.0`, `7.0-debian-10`, `7.0.0`, `7.0.0-debian-10-r-1`, `latest` (7.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/7.0.0-debian-10-r-1/7.0/debian-10/Dockerfile)
-* [`6.2`, `6.2-debian-10`, `6.2.7`, `6.2.7-debian-10-r33` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.2.7-debian-10-r33/6.2/debian-10/Dockerfile)
+* [`6.2`, `6.2-debian-10`, `6.2.7`, `6.2.7-debian-10-r34` (6.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.2.7-debian-10-r34/6.2/debian-10/Dockerfile)
 * [`6.0`, `6.0-debian-10`, `6.0.16`, `6.0.16-debian-10-r231` (6.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis-sentinel/blob/6.0.16-debian-10-r231/6.0/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/redis-sentinel GitHub repo](https://github.com/bitnami/bitnami-docker-redis-sentinel).