diff --git a/bitnami/redis-sentinel/6.2/debian-11/Dockerfile b/bitnami/redis-sentinel/6.2/debian-11/Dockerfile index 6318cfbb5f55..481975f0e338 100644 --- a/bitnami/redis-sentinel/6.2/debian-11/Dockerfile +++ b/bitnami/redis-sentinel/6.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:45:07Z" \ + org.opencontainers.image.created="2024-02-16T15:18:22Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.2.14-debian-11-r22" \ + org.opencontainers.image.ref.name="6.2.14-debian-11-r23" \ org.opencontainers.image.title="redis-sentinel" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.14" diff --git a/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh b/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh index ceca4adbd928..6f4dd20bbf43 100644 --- a/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh +++ b/bitnami/redis-sentinel/6.2/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/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/postunpack.sh b/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/postunpack.sh index 67b50019344d..933f4d99231f 100755 --- a/bitnami/redis-sentinel/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-sentinel/postunpack.sh +++ b/bitnami/redis-sentinel/6.2/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 diff --git a/bitnami/redis-sentinel/README.md b/bitnami/redis-sentinel/README.md index 5d3ca358515f..82bd6ab3c37b 100644 --- a/bitnami/redis-sentinel/README.md +++ b/bitnami/redis-sentinel/README.md @@ -131,6 +131,7 @@ docker run -it --rm \ | `REDIS_SENTINEL_VOLUME_DIR` | Persistence base directory | `/bitnami/redis-sentinel` | | `REDIS_SENTINEL_BASE_DIR` | Redis installation directory | `${BITNAMI_ROOT_DIR}/redis-sentinel` | | `REDIS_SENTINEL_CONF_DIR` | Redis configuration directory | `${REDIS_SENTINEL_BASE_DIR}/etc` | +| `REDIS_SENTINEL_DEFAULT_CONF_DIR` | Redis default configuration directory | `${REDIS_SENTINEL_BASE_DIR}/etc.default` | | `REDIS_SENTINEL_MOUNTED_CONF_DIR` | Redis mounted configuration directory | `${REDIS_SENTINEL_BASE_DIR}/mounted-etc` | | `REDIS_SENTINEL_CONF_FILE` | Redis configuration file | `${REDIS_SENTINEL_CONF_DIR}/sentinel.conf` | | `REDIS_SENTINEL_LOG_DIR` | Redis logs directory | `${REDIS_SENTINEL_BASE_DIR}/logs` |