From 570cfade56b180c0c28049f96133fff4888f00aa Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 16 Feb 2024 20:25:38 +0100 Subject: [PATCH] [bitnami/redis] Release 6.2.14-debian-11-r19 (#61998) Signed-off-by: Bitnami Containers --- bitnami/redis/6.2/debian-11/Dockerfile | 4 ++-- .../6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 2 ++ .../6.2/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh | 5 +++-- .../rootfs/opt/bitnami/scripts/redis/entrypoint.sh | 6 ++++++ .../rootfs/opt/bitnami/scripts/redis/postunpack.sh | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bitnami/redis/6.2/debian-11/Dockerfile b/bitnami/redis/6.2/debian-11/Dockerfile index 9baca1cee535..25b7f9f7f62d 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="2024-02-15T08:03:55Z" \ + org.opencontainers.image.created="2024-02-16T18:44:27Z" \ 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-r18" \ + org.opencontainers.image.ref.name="6.2.14-debian-11-r19" \ org.opencontainers.image.title="redis" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.14" 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 34329c95fa66..83f54f4c347f 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 @@ -270,6 +270,7 @@ redis_configure_replication() { if [[ -n "$REDIS_SENTINEL_HOST" ]]; then local -a sentinel_info_command=("redis-cli" "-h" "${REDIS_SENTINEL_HOST}" "-p" "${REDIS_SENTINEL_PORT_NUMBER}") is_boolean_yes "$REDIS_TLS_ENABLED" && sentinel_info_command+=("--tls" "--cert" "${REDIS_TLS_CERT_FILE}" "--key" "${REDIS_TLS_KEY_FILE}") + # shellcheck disable=SC2015 is_empty_value "$REDIS_TLS_CA_FILE" && sentinel_info_command+=("--cacertdir" "${REDIS_TLS_CA_DIR}") || sentinel_info_command+=("--cacert" "${REDIS_TLS_CA_FILE}") sentinel_info_command+=("sentinel" "get-master-addr-by-name" "${REDIS_SENTINEL_MASTER_NAME}") read -r -a REDIS_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}" | tr '\n' ' ')" @@ -436,6 +437,7 @@ redis_configure_default() { fi redis_conf_set tls-cert-file "$REDIS_TLS_CERT_FILE" redis_conf_set tls-key-file "$REDIS_TLS_KEY_FILE" + # shellcheck disable=SC2015 is_empty_value "$REDIS_TLS_CA_FILE" && redis_conf_set tls-ca-cert-dir "$REDIS_TLS_CA_DIR" || redis_conf_set tls-ca-cert-file "$REDIS_TLS_CA_FILE" ! is_empty_value "$REDIS_TLS_KEY_FILE_PASS" && redis_conf_set tls-key-file-pass "$REDIS_TLS_KEY_FILE_PASS" [[ -n "$REDIS_TLS_DH_PARAMS_FILE" ]] && redis_conf_set tls-dh-params-file "$REDIS_TLS_DH_PARAMS_FILE" 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 5d3bb6b61705..d82c91b692f8 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 @@ -48,10 +48,10 @@ redis_env_vars=( REDIS_TLS_ENABLED REDIS_TLS_PORT_NUMBER REDIS_TLS_CERT_FILE + REDIS_TLS_CA_DIR REDIS_TLS_KEY_FILE REDIS_TLS_KEY_FILE_PASS REDIS_TLS_CA_FILE - REDIS_TLS_CA_DIR REDIS_TLS_DH_PARAMS_FILE REDIS_TLS_AUTH_CLIENTS REDIS_SENTINEL_MASTER_NAME @@ -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}" @@ -118,10 +119,10 @@ export REDIS_TLS_ENABLED="${REDIS_TLS_ENABLED:-no}" REDIS_TLS_PORT_NUMBER="${REDIS_TLS_PORT_NUMBER:-"${REDIS_TLS_PORT:-}"}" export REDIS_TLS_PORT_NUMBER="${REDIS_TLS_PORT_NUMBER:-6379}" export REDIS_TLS_CERT_FILE="${REDIS_TLS_CERT_FILE:-}" +export REDIS_TLS_CA_DIR="${REDIS_TLS_CA_DIR:-}" export REDIS_TLS_KEY_FILE="${REDIS_TLS_KEY_FILE:-}" export REDIS_TLS_KEY_FILE_PASS="${REDIS_TLS_KEY_FILE_PASS:-}" export REDIS_TLS_CA_FILE="${REDIS_TLS_CA_FILE:-}" -export REDIS_TLS_CA_DIR="${REDIS_TLS_CA_DIR:-}" export REDIS_TLS_DH_PARAMS_FILE="${REDIS_TLS_DH_PARAMS_FILE:-}" export REDIS_TLS_AUTH_CLIENTS="${REDIS_TLS_AUTH_CLIENTS:-yes}" diff --git a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis/entrypoint.sh b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis/entrypoint.sh index b0f1c7f9558e..f2a730c6d496 100755 --- a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis/entrypoint.sh +++ b/bitnami/redis/6.2/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/6.2/debian-11/rootfs/opt/bitnami/scripts/redis/postunpack.sh b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis/postunpack.sh index 2e0e5a87678c..4f424ddd8cfd 100755 --- a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/redis/postunpack.sh +++ b/bitnami/redis/6.2/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"