From e75b25a9739dec00766bc450206f4dc9089260a0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 9 Aug 2022 07:56:46 +0200 Subject: [PATCH] [bitnami/redis] Release 7.0.4-debian-11-r11 (#2521) Signed-off-by: Bitnami Containers --- bitnami/redis/7.0/debian-11/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 12 ++++++------ .../debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 5 +---- bitnami/redis/README.md | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/bitnami/redis/7.0/debian-11/Dockerfile b/bitnami/redis/7.0/debian-11/Dockerfile index 4c438c56139e..95cd0066c087 100644 --- a/bitnami/redis/7.0/debian-11/Dockerfile +++ b/bitnami/redis/7.0/debian-11/Dockerfile @@ -8,9 +8,9 @@ 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 "wait-for-port" "1.0.3-152" --checksum 0694ae67645c416d9f6875e90c0f7cef379b4ac8030a6a5b8b5cc9ca77c6975d -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 "wait-for-port" "1.0.3-153" --checksum 8c8e324ab6e7b7d76b4655182d6ea5f6550edfc9e32bec92228e678c26fc8b16 +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/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 38486fbf6dcf..13ead78ca40b 100644 --- a/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redis/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,23 +1,23 @@ { "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" }, "wait-for-port": { "arch": "amd64", - "digest": "0694ae67645c416d9f6875e90c0f7cef379b4ac8030a6a5b8b5cc9ca77c6975d", + "digest": "8c8e324ab6e7b7d76b4655182d6ea5f6550edfc9e32bec92228e678c26fc8b16", "distro": "debian-11", "type": "NAMI", - "version": "1.0.3-152" + "version": "1.0.3-153" } } \ No newline at end of file diff --git a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index c69c14cb5a56..7fc388b20d60 100644 --- a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis/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/README.md b/bitnami/redis/README.md index 3c7bd9c08dac..794b98bf6e3d 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -47,7 +47,7 @@ Non-root container images add an extra layer of security and are generally recom 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-r10`, `latest` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis/7.0/debian-11/Dockerfile) +* [`7.0`, `7.0-debian-11`, `7.0.4`, `7.0.4-debian-11-r11`, `latest` (7.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis/7.0/debian-11/Dockerfile) * [`6.2`, `6.2-debian-11`, `6.2.7`, `6.2.7-debian-11-r25` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/redis/6.2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).