diff --git a/bitnami/redis-cluster/7.0/debian-11/Dockerfile b/bitnami/redis-cluster/7.0/debian-11/Dockerfile index 426d5bbe5bdb..70fe48feb7c1 100644 --- a/bitnami/redis-cluster/7.0/debian-11/Dockerfile +++ b/bitnami/redis-cluster/7.0/debian-11/Dockerfile @@ -8,8 +8,8 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libssl1.1 procps tar -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "redis" "7.0.4-1" --checksum 295130284b985759f807eaf8c93018a93ae890d7a9d64c19f363f59c1c5cf17c -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-152" --checksum 0c751c7e2ec0bc900a19dbec0306d6294fe744ddfb0fa64197ba1a36040092f0 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "redis" "7.0.4-2" --checksum 743799735f6f03b4e00257e264b7170e259f4cd4d99a03f959d248d36e0eb6ec +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-153" --checksum d3ae0109be24e8bc56f97359b8290b91243454de946dd60bd8520a0896a88449 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f0c650ea7b37..4641725efa5e 100644 --- a/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis-cluster/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,16 +1,16 @@ { "gosu": { "arch": "amd64", - "digest": "0c751c7e2ec0bc900a19dbec0306d6294fe744ddfb0fa64197ba1a36040092f0", + "digest": "d3ae0109be24e8bc56f97359b8290b91243454de946dd60bd8520a0896a88449", "distro": "debian-11", "type": "NAMI", - "version": "1.14.0-152" + "version": "1.14.0-153" }, "redis": { "arch": "amd64", - "digest": "295130284b985759f807eaf8c93018a93ae890d7a9d64c19f363f59c1c5cf17c", + "digest": "743799735f6f03b4e00257e264b7170e259f4cd4d99a03f959d248d36e0eb6ec", "distro": "debian-11", "type": "NAMI", - "version": "7.0.4-1" + "version": "7.0.4-2" } } \ No newline at end of file diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index c69c14cb5a56..7fc388b20d60 100644 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -220,9 +220,6 @@ redis_validate() { elif [[ ! -f "$REDIS_TLS_KEY_FILE" ]]; then print_validation_error "The private key file in the specified path ${REDIS_TLS_KEY_FILE} does not exist" fi - if [[ ! -f "$REDIS_TLS_KEY_FILE_PASS" ]]; then - print_validation_error "The passphrase for the private key file in the specified path ${REDIS_TLS_KEY_FILE_PASS} does not exist" - fi if [[ -z "$REDIS_TLS_CA_FILE" ]]; then print_validation_error "You must provide a CA X.509 certificate in order to use TLS" elif [[ ! -f "$REDIS_TLS_CA_FILE" ]]; then @@ -412,8 +409,8 @@ redis_configure_default() { fi redis_conf_set tls-cert-file "$REDIS_TLS_CERT_FILE" redis_conf_set tls-key-file "$REDIS_TLS_KEY_FILE" - redis_conf_set tls-key-file-pass "$REDIS_TLS_KEY_FILE_PASS" 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" redis_conf_set tls-auth-clients "$REDIS_TLS_AUTH_CLIENTS" fi diff --git a/bitnami/redis-cluster/README.md b/bitnami/redis-cluster/README.md index 86a6710c5d27..7183821f3680 100644 --- a/bitnami/redis-cluster/README.md +++ b/bitnami/redis-cluster/README.md @@ -41,7 +41,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`7.0`, `7.0-debian-11`, `7.0.4`, `7.0.4-debian-11-r3`, `latest` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis-cluster/7.0/debian-11/Dockerfile) +* [`7.0`, `7.0-debian-11`, `7.0.4`, `7.0.4-debian-11-r4`, `latest` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis-cluster/7.0/debian-11/Dockerfile) * [`6.2`, `6.2-debian-11`, `6.2.7`, `6.2.7-debian-11-r19` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis-cluster/6.2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).