From 46d5ec35992064ae229f0e96f06984204a1a4664 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 22 Jul 2022 17:03:42 +0200 Subject: [PATCH] [bitnami/redis] Release 6.2.7-debian-11-r18 (#359) Signed-off-by: Bitnami Containers --- .../6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 4 ++++ .../6.2/debian-11/rootfs/opt/bitnami/scripts/redis-env.sh | 2 ++ bitnami/redis/README.md | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) 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 ff3e1ac9df63..c69c14cb5a56 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 @@ -220,6 +220,9 @@ 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 @@ -409,6 +412,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" + redis_conf_set tls-key-file-pass "$REDIS_TLS_KEY_FILE_PASS" redis_conf_set tls-ca-cert-file "$REDIS_TLS_CA_FILE" [[ -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" 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 c5e3f6989c6e..6d761511645b 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 @@ -45,6 +45,7 @@ redis_env_vars=( REDIS_TLS_PORT_NUMBER REDIS_TLS_CERT_FILE REDIS_TLS_KEY_FILE + REDIS_TLS_KEY_FILE_PASS REDIS_TLS_CA_FILE REDIS_TLS_DH_PARAMS_FILE REDIS_TLS_AUTH_CLIENTS @@ -111,6 +112,7 @@ 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_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_DH_PARAMS_FILE="${REDIS_TLS_DH_PARAMS_FILE:-}" export REDIS_TLS_AUTH_CLIENTS="${REDIS_TLS_AUTH_CLIENTS:-yes}" diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index d742c0654aff..7ba2a116dbb0 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`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/bitnami-docker-redis/blob/7.0.4-debian-11-r3/7.0/debian-11/Dockerfile) -* [`6.2`, `6.2-debian-11`, `6.2.7`, `6.2.7-debian-11-r17` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis/blob/6.2.7-debian-11-r17/6.2/debian-11/Dockerfile) +* [`6.2`, `6.2-debian-11`, `6.2.7`, `6.2.7-debian-11-r18` (6.2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-redis/blob/6.2.7-debian-11-r18/6.2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/redis GitHub repo](https://github.com/bitnami/bitnami-docker-redis).