From 89a371620874b6326046f961e2db761ee227ee46 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 16 Feb 2024 19:22:37 +0100
Subject: [PATCH] [bitnami/redis] Release 7.0.15-debian-11-r19 (#61927)

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/redis-env.sh   | 1 +
 .../rootfs/opt/bitnami/scripts/redis/entrypoint.sh          | 6 ++++++
 .../rootfs/opt/bitnami/scripts/redis/postunpack.sh          | 2 +-
 bitnami/redis/README.md                                     | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bitnami/redis/7.0/debian-11/Dockerfile b/bitnami/redis/7.0/debian-11/Dockerfile
index 6f876e4591e5..02dd2175ae09 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-15T19:42:44Z" \
+      org.opencontainers.image.created="2024-02-16T15:32:40Z" \
       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" \
       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/redis-env.sh b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh
index a52df9d67776..d82c91b692f8 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
@@ -76,6 +76,7 @@ unset redis_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/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/entrypoint.sh b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/entrypoint.sh
index b0f1c7f9558e..f2a730c6d496 100755
--- a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/entrypoint.sh
+++ b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/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 [[ "$*" = *"/opt/bitnami/scripts/redis/run.sh"* || "$*" = *"/run.sh"* ]]; then
     info "** Starting Redis setup **"
     /opt/bitnami/scripts/redis/setup.sh
diff --git a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/postunpack.sh b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/postunpack.sh
index 2e0e5a87678c..4f424ddd8cfd 100755
--- a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/postunpack.sh
+++ b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/redis/postunpack.sh
@@ -16,7 +16,7 @@ set -o pipefail
 . /opt/bitnami/scripts/libredis.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
 chmod -R g+rwX /bitnami "$REDIS_VOLUME_DIR" "$REDIS_BASE_DIR"
diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md
index 340f586684bc..94048ac1c6f6 100644
--- a/bitnami/redis/README.md
+++ b/bitnami/redis/README.md
@@ -196,6 +196,7 @@ docker-compose up -d
 | `REDIS_VOLUME_DIR`          | Persistence base directory            | `/bitnami/redis`                |
 | `REDIS_BASE_DIR`            | Redis installation directory          | `${BITNAMI_ROOT_DIR}/redis`     |
 | `REDIS_CONF_DIR`            | Redis configuration directory         | `${REDIS_BASE_DIR}/etc`         |
+| `REDIS_DEFAULT_CONF_DIR`    | Redis default configuration directory | `${REDIS_BASE_DIR}/etc.default` |
 | `REDIS_MOUNTED_CONF_DIR`    | Redis mounted configuration directory | `${REDIS_BASE_DIR}/mounted-etc` |
 | `REDIS_CONF_FILE`           | Redis configuration file              | `${REDIS_CONF_DIR}/redis.conf`  |
 | `REDIS_LOG_DIR`             | Redis logs directory                  | `${REDIS_BASE_DIR}/logs`        |