diff --git a/bitnami/redis-cluster/7.0/debian-11/Dockerfile b/bitnami/redis-cluster/7.0/debian-11/Dockerfile index 9e33c9584d24..426d5bbe5bdb 100644 --- a/bitnami/redis-cluster/7.0/debian-11/Dockerfile +++ b/bitnami/redis-cluster/7.0/debian-11/Dockerfile @@ -8,7 +8,7 @@ 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-0" --checksum 295130284b985759f807eaf8c93018a93ae890d7a9d64c19f363f59c1c5cf17c +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 apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives 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 472d15a605f9..f0c650ea7b37 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 @@ -11,6 +11,6 @@ "digest": "295130284b985759f807eaf8c93018a93ae890d7a9d64c19f363f59c1c5cf17c", "distro": "debian-11", "type": "NAMI", - "version": "7.0.4-0" + "version": "7.0.4-1" } } \ 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 3ac2f96d3de4..c69c14cb5a56 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,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,10 +412,15 @@ 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" fi + # Multithreading configuration + ! is_empty_value "$REDIS_IO_THREADS_DO_READS" && redis_conf_set "io-threads-do-reads" "$REDIS_IO_THREADS_DO_READS" + ! is_empty_value "$REDIS_IO_THREADS" && redis_conf_set "io-threads" "$REDIS_IO_THREADS" + if [[ -n "$REDIS_PASSWORD" ]]; then redis_conf_set requirepass "$REDIS_PASSWORD" else diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh index d5951eae3bb8..f44a9517dfc6 100644 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/librediscluster.sh @@ -91,6 +91,13 @@ redis_cluster_override_conf() { redis_conf_set tls-cluster yes redis_conf_set tls-replication yes fi + # Multithreading configuration + if ! is_empty_value "$REDIS_IO_THREADS_DO_READS"; then + redis_conf_set "io-threads-do-reads" "$REDIS_IO_THREADS_DO_READS" + fi + if ! is_empty_value "$REDIS_IO_THREADS"; then + redis_conf_set "io-threads" "$REDIS_IO_THREADS" + fi } ######################## diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh index ddfa010946f1..743ace137179 100644 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh @@ -39,10 +39,13 @@ redis_cluster_env_vars=( REDIS_PASSWORD REDIS_MASTER_PASSWORD REDIS_ACLFILE + REDIS_IO_THREADS_DO_READS + REDIS_IO_THREADS REDIS_TLS_ENABLED 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 @@ -106,6 +109,8 @@ export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" export REDIS_PASSWORD="${REDIS_PASSWORD:-}" export REDIS_MASTER_PASSWORD="${REDIS_MASTER_PASSWORD:-}" export REDIS_ACLFILE="${REDIS_ACLFILE:-}" +export REDIS_IO_THREADS_DO_READS="${REDIS_IO_THREADS_DO_READS:-}" +export REDIS_IO_THREADS="${REDIS_IO_THREADS:-}" # TLS settings export REDIS_TLS_ENABLED="${REDIS_TLS_ENABLED:-no}" @@ -113,6 +118,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-cluster/README.md b/bitnami/redis-cluster/README.md index c4be853fd13a..24cb10428ced 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-r1`, `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-r2`, `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-r17` (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).