From 6f159377650d36414ae23e1ccf359b494a2a8325 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 16 Feb 2024 20:21:53 +0100
Subject: [PATCH] [bitnami/redis-sentinel] Release 7.0.15-debian-11-r19
 (#61993)

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

diff --git a/bitnami/redis-sentinel/7.0/debian-11/Dockerfile b/bitnami/redis-sentinel/7.0/debian-11/Dockerfile
index 2ac693b12a95..f58e77dfff50 100644
--- a/bitnami/redis-sentinel/7.0/debian-11/Dockerfile
+++ b/bitnami/redis-sentinel/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-15T19:43:16Z" \
+      org.opencontainers.image.created="2024-02-16T18:37:20Z" \
       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-r18" \
+      org.opencontainers.image.ref.name="7.0.15-debian-11-r19" \
       org.opencontainers.image.title="redis-sentinel" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.0.15"
diff --git a/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh b/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh
index ceca4adbd928..6f4dd20bbf43 100644
--- a/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh
+++ b/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh
@@ -71,6 +71,7 @@ unset redis_sentinel_env_vars
 export REDIS_SENTINEL_VOLUME_DIR="/bitnami/redis-sentinel"
 export REDIS_SENTINEL_BASE_DIR="${BITNAMI_ROOT_DIR}/redis-sentinel"
 export REDIS_SENTINEL_CONF_DIR="${REDIS_SENTINEL_BASE_DIR}/etc"
+export REDIS_SENTINEL_DEFAULT_CONF_DIR="${REDIS_SENTINEL_BASE_DIR}/etc.default"
 export REDIS_SENTINEL_DATA_DIR="${REDIS_SENTINEL_DATA_DIR:-${REDIS_SENTINEL_VOLUME_DIR}/data}"
 export REDIS_SENTINEL_MOUNTED_CONF_DIR="${REDIS_SENTINEL_BASE_DIR}/mounted-etc"
 export REDIS_SENTINEL_CONF_FILE="${REDIS_SENTINEL_CONF_DIR}/sentinel.conf"
diff --git a/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/postunpack.sh b/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/postunpack.sh
index 67b50019344d..933f4d99231f 100755
--- a/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/postunpack.sh
+++ b/bitnami/redis-sentinel/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/postunpack.sh
@@ -18,7 +18,7 @@ set -o pipefail
 . /opt/bitnami/scripts/liblog.sh
 
 # Ensure non-root user has write permissions on a set of directories
-for dir in "$REDIS_SENTINEL_BASE_DIR" "$REDIS_SENTINEL_CONF_DIR" "$REDIS_SENTINEL_LOG_DIR" "$REDIS_SENTINEL_TMP_DIR" "$REDIS_SENTINEL_VOLUME_DIR" "${REDIS_SENTINEL_VOLUME_DIR}/conf"; do
+for dir in "$REDIS_SENTINEL_BASE_DIR" "$REDIS_SENTINEL_CONF_DIR" "$REDIS_SENTINEL_LOG_DIR" "$REDIS_SENTINEL_TMP_DIR" "$REDIS_SENTINEL_VOLUME_DIR" "${REDIS_SENTINEL_VOLUME_DIR}/conf" "$REDIS_SENTINEL_DEFAULT_CONF_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done
@@ -30,3 +30,7 @@ redis_conf_set "pidfile" "$REDIS_SENTINEL_PID_FILE"
 # Send logs to stdout
 redis_conf_set "daemonize" "no"
 redis_conf_set "logfile" ""
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "${REDIS_SENTINEL_CONF_DIR}/"* "$REDIS_SENTINEL_DEFAULT_CONF_DIR"
\ No newline at end of file