From fa68c5dc30a0498b19f121b482563847bde04b97 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 15 Feb 2024 21:48:30 +0100
Subject: [PATCH] [bitnami/redis] Release 7.0.15-debian-11-r18 (#61347)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/redis/7.0/debian-11/Dockerfile                        | 4 ++--
 .../7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh      | 2 ++
 .../7.0/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bitnami/redis/7.0/debian-11/Dockerfile b/bitnami/redis/7.0/debian-11/Dockerfile
index 7b834a4e524d..6f876e4591e5 100644
--- a/bitnami/redis/7.0/debian-11/Dockerfile
+++ b/bitnami/redis/7.0/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2024-02-15T07:23:59Z" \
+      org.opencontainers.image.created="2024-02-15T19:42:44Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.0.15-debian-11-r17" \
+      org.opencontainers.image.ref.name="7.0.15-debian-11-r18" \
       org.opencontainers.image.title="redis" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.0.15"
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 34329c95fa66..83f54f4c347f 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
@@ -270,6 +270,7 @@ redis_configure_replication() {
         if [[ -n "$REDIS_SENTINEL_HOST" ]]; then
             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}")
+            # shellcheck disable=SC2015
             is_empty_value "$REDIS_TLS_CA_FILE" && sentinel_info_command+=("--cacertdir" "${REDIS_TLS_CA_DIR}") || sentinel_info_command+=("--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[@]}" | tr '\n' ' ')"
@@ -436,6 +437,7 @@ redis_configure_default() {
             fi
             redis_conf_set tls-cert-file "$REDIS_TLS_CERT_FILE"
             redis_conf_set tls-key-file "$REDIS_TLS_KEY_FILE"
+            # shellcheck disable=SC2015
             is_empty_value "$REDIS_TLS_CA_FILE" && redis_conf_set tls-ca-cert-dir "$REDIS_TLS_CA_DIR" || redis_conf_set tls-ca-cert-file "$REDIS_TLS_CA_FILE"
             ! is_empty_value "$REDIS_TLS_KEY_FILE_PASS" && redis_conf_set tls-key-file-pass "$REDIS_TLS_KEY_FILE_PASS"
             [[ -n "$REDIS_TLS_DH_PARAMS_FILE" ]] && redis_conf_set tls-dh-params-file "$REDIS_TLS_DH_PARAMS_FILE"
diff --git a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh
index 5d3bb6b61705..a52df9d67776 100644
--- a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh
+++ b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh
@@ -48,10 +48,10 @@ redis_env_vars=(
     REDIS_TLS_ENABLED
     REDIS_TLS_PORT_NUMBER
     REDIS_TLS_CERT_FILE
+    REDIS_TLS_CA_DIR
     REDIS_TLS_KEY_FILE
     REDIS_TLS_KEY_FILE_PASS
     REDIS_TLS_CA_FILE
-    REDIS_TLS_CA_DIR
     REDIS_TLS_DH_PARAMS_FILE
     REDIS_TLS_AUTH_CLIENTS
     REDIS_SENTINEL_MASTER_NAME
@@ -118,10 +118,10 @@ export REDIS_TLS_ENABLED="${REDIS_TLS_ENABLED:-no}"
 REDIS_TLS_PORT_NUMBER="${REDIS_TLS_PORT_NUMBER:-"${REDIS_TLS_PORT:-}"}"
 export REDIS_TLS_PORT_NUMBER="${REDIS_TLS_PORT_NUMBER:-6379}"
 export REDIS_TLS_CERT_FILE="${REDIS_TLS_CERT_FILE:-}"
+export REDIS_TLS_CA_DIR="${REDIS_TLS_CA_DIR:-}"
 export REDIS_TLS_KEY_FILE="${REDIS_TLS_KEY_FILE:-}"
 export REDIS_TLS_KEY_FILE_PASS="${REDIS_TLS_KEY_FILE_PASS:-}"
 export REDIS_TLS_CA_FILE="${REDIS_TLS_CA_FILE:-}"
-export REDIS_TLS_CA_DIR="${REDIS_TLS_CA_DIR:-}"
 export REDIS_TLS_DH_PARAMS_FILE="${REDIS_TLS_DH_PARAMS_FILE:-}"
 export REDIS_TLS_AUTH_CLIENTS="${REDIS_TLS_AUTH_CLIENTS:-yes}"