From 7c470313f8173f4c9915df7b992c969cfe62ac48 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 16 Feb 2024 19:19:16 +0100
Subject: [PATCH] [bitnami/redis-cluster] Release 7.2.4-debian-11-r20 (#61924)

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

diff --git a/bitnami/redis-cluster/7.2/debian-11/Dockerfile b/bitnami/redis-cluster/7.2/debian-11/Dockerfile
index 54fc5f877a8a..11c6bf86f473 100644
--- a/bitnami/redis-cluster/7.2/debian-11/Dockerfile
+++ b/bitnami/redis-cluster/7.2/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-15T19:44:10Z" \
+      org.opencontainers.image.created="2024-02-16T15:17:49Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.2.4-debian-11-r19" \
+      org.opencontainers.image.ref.name="7.2.4-debian-11-r20" \
       org.opencontainers.image.title="redis-cluster" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.2.4"
diff --git a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh
index 3b7d11cc8b72..02d5657b0408 100644
--- a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh
+++ b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh
@@ -86,6 +86,7 @@ unset redis_cluster_env_vars
 export REDIS_VOLUME_DIR="/bitnami/redis"
 export REDIS_BASE_DIR="${BITNAMI_ROOT_DIR}/redis"
 export REDIS_CONF_DIR="${REDIS_BASE_DIR}/etc"
+export REDIS_DEFAULT_CONF_DIR="${REDIS_BASE_DIR}/etc.default"
 export REDIS_DATA_DIR="${REDIS_DATA_DIR:-${REDIS_VOLUME_DIR}/data}"
 export REDIS_MOUNTED_CONF_DIR="${REDIS_BASE_DIR}/mounted-etc"
 export REDIS_OVERRIDES_FILE="${REDIS_OVERRIDES_FILE:-${REDIS_MOUNTED_CONF_DIR}/overrides.conf}"
diff --git a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/entrypoint.sh b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/entrypoint.sh
index 236865cc30e1..ac2dc823e5ef 100755
--- a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/entrypoint.sh
+++ b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/entrypoint.sh
@@ -18,6 +18,12 @@ set -o pipefail
 
 print_welcome_page
 
+# We add the copy from default config in the entrypoint to not break users 
+# bypassing the setup.sh logic. If the file already exists do not overwrite (in
+# case someone mounts a configuration file in /opt/bitnami/redis/etc)
+debug "Copying files from $REDIS_DEFAULT_CONF_DIR to $REDIS_CONF_DIR"
+cp -nr "$REDIS_DEFAULT_CONF_DIR"/. "$REDIS_CONF_DIR"
+
 if [[ "$*" = *"/run.sh"* ]]; then
     info "** Starting Redis setup **"
     /opt/bitnami/scripts/redis-cluster/setup.sh
diff --git a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/postunpack.sh b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/postunpack.sh
index 46724b92967b..3833524da3ce 100755
--- a/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/postunpack.sh
+++ b/bitnami/redis-cluster/7.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster/postunpack.sh
@@ -16,7 +16,7 @@ set -o pipefail
 . /opt/bitnami/scripts/librediscluster.sh
 . /opt/bitnami/scripts/libfs.sh
 
-for dir in "$REDIS_VOLUME_DIR" "$REDIS_DATA_DIR" "$REDIS_BASE_DIR" "$REDIS_CONF_DIR"; do
+for dir in "$REDIS_VOLUME_DIR" "$REDIS_DATA_DIR" "$REDIS_BASE_DIR" "$REDIS_CONF_DIR" "$REDIS_DEFAULT_CONF_DIR"; do
     ensure_dir_exists "$dir"
 done