diff --git a/bitnami/redis/6.2/debian-11/Dockerfile b/bitnami/redis/6.2/debian-11/Dockerfile index 0f04985c0f12..57023c4ef4bd 100644 --- a/bitnami/redis/6.2/debian-11/Dockerfile +++ b/bitnami/redis/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="2023-08-08T00:15:25Z" \ + org.opencontainers.image.created="2023-08-12T03:21:44Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.2.13-debian-11-r25" \ + org.opencontainers.image.ref.name="6.2.13-debian-11-r28" \ org.opencontainers.image.title="redis" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.13" diff --git a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index caa469e9b164..09ad07460a17 100644 --- a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -57,7 +57,7 @@ redis_conf_set() { [[ "$value" = "" ]] && value="\"$value\"" # Determine whether to enable the configuration for RDB persistence, if yes, do not enable the replacement operation - if [ "${key}" == "save" ];then + if [ "${key}" == "save" ]; then echo "${key} ${value}" >> "${REDIS_BASE_DIR}/etc/redis.conf" else replace_in_file "${REDIS_BASE_DIR}/etc/redis.conf" "^#*\s*${key} .*" "${key} ${value}" false @@ -408,12 +408,14 @@ redis_configure_default() { redis_conf_set appendonly "${REDIS_AOF_ENABLED}" #The value stored in $i here is the number of seconds and times of save rules in redis rdb mode - if [ -z "${REDIS_RDB_POLICY}" ];then - redis_conf_set save "" + if is_empty_value "$REDIS_RDB_POLICY"; then + if is_boolean_yes "$REDIS_RDB_POLICY_DISABLED"; then + redis_conf_set save "" + fi else - for i in ${REDIS_RDB_POLICY};do - redis_conf_set save "${i//#/ }" - done + for i in ${REDIS_RDB_POLICY}; do + redis_conf_set save "${i//#/ }" + done fi redis_conf_set port "$REDIS_PORT_NUMBER" diff --git a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh index 04e85058532d..ed9a7f67a4f5 100644 --- a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh +++ b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh @@ -30,6 +30,7 @@ redis_env_vars=( REDIS_DATABASE REDIS_AOF_ENABLED REDIS_RDB_POLICY + REDIS_RDB_POLICY_DISABLED REDIS_MASTER_HOST REDIS_MASTER_PORT_NUMBER REDIS_PORT_NUMBER @@ -94,6 +95,7 @@ export REDIS_DISABLE_COMMANDS="${REDIS_DISABLE_COMMANDS:-}" export REDIS_DATABASE="${REDIS_DATABASE:-redis}" export REDIS_AOF_ENABLED="${REDIS_AOF_ENABLED:-yes}" export REDIS_RDB_POLICY="${REDIS_RDB_POLICY:-}" +export REDIS_RDB_POLICY_DISABLED="${REDIS_RDB_POLICY_DISABLED:-no}" export REDIS_MASTER_HOST="${REDIS_MASTER_HOST:-}" export REDIS_MASTER_PORT_NUMBER="${REDIS_MASTER_PORT_NUMBER:-6379}" export REDIS_DEFAULT_PORT_NUMBER="6379" # only used at build time