diff --git a/bitnami/redis-cluster/6.2/debian-11/Dockerfile b/bitnami/redis-cluster/6.2/debian-11/Dockerfile index 717f12ad9a8a..68af0d39ea13 100644 --- a/bitnami/redis-cluster/6.2/debian-11/Dockerfile +++ b/bitnami/redis-cluster/6.2/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-04-10T22:40:15Z" \ + org.opencontainers.image.created="2023-04-13T23:02:55Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.2.11-debian-11-r12" \ + org.opencontainers.image.ref.name="6.2.11-debian-11-r13" \ org.opencontainers.image.title="redis-cluster" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.2.11" diff --git a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index 53191e0aa2e4..976b056b17bc 100644 --- a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -55,10 +55,10 @@ redis_conf_set() { [[ "$value" = "" ]] && value="\"$value\"" # Determine whether to enable the configuration for RDB persistence, if yes, do not enable the replacement operation - if [ ${key} == "save" ];then - echo "${key} ${value}" >> ${REDIS_BASE_DIR}/etc/redis.conf - else - replace_in_file "${REDIS_BASE_DIR}/etc/redis.conf" "^#*\s*${key} .*" "${key} ${value}" false + if [ "${key}" == "save" ];then + echo "${key} ${value}" >> "${REDIS_BASE_DIR}/etc/redis.conf" + else + replace_in_file "${REDIS_BASE_DIR}/etc/redis.conf" "^#*\s*${key} .*" "${key} ${value}" false fi } diff --git a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh index 01af41bdfcf8..f508b6a6bc24 100644 --- a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh +++ b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/redis-cluster-env.sh @@ -101,7 +101,7 @@ export REDIS_DAEMON_GROUP="redis" export REDIS_DISABLE_COMMANDS="${REDIS_DISABLE_COMMANDS:-}" export REDIS_DATABASE="${REDIS_DATABASE:-redis}" export REDIS_AOF_ENABLED="${REDIS_AOF_ENABLED:-yes}" -export REDIS_RDB_POLICY="${REDIS_RDB_POLICY:-""}" +export REDIS_RDB_POLICY="${REDIS_RDB_POLICY:-}" export REDIS_MASTER_HOST="${REDIS_MASTER_HOST:-}" export REDIS_MASTER_PORT_NUMBER="${REDIS_MASTER_PORT_NUMBER:-6379}" export REDIS_DEFAULT_PORT_NUMBER="6379" # only used at build time diff --git a/bitnami/redis-cluster/README.md b/bitnami/redis-cluster/README.md index eefb79b9f962..bbd7ac155ea8 100644 --- a/bitnami/redis-cluster/README.md +++ b/bitnami/redis-cluster/README.md @@ -168,35 +168,35 @@ services: The following env vars are supported for this container: -| Name | Description | -|-----------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `REDIS_DISABLE_COMMANDS` | Disables the specified Redis(R) commands | -| `REDIS_PORT_NUMBER` | Set the Redis(R) port. Default=: `6379` | -| `REDIS_PASSWORD` | Set the Redis(R) password. Default: `bitnami` | -| `ALLOW_EMPTY_PASSWORD` | Enables access without password | -| `REDIS_DNS_RETRIES` | Number of retries to get the IPs of the provided `REDIS_NODES`. It will wait 5 seconds between retries | -| `REDISCLI_AUTH` | Provide the same value as the configured `REDIS_PASSWORD` for the redis-cli tool to authenticate | -| `REDIS_CLUSTER_CREATOR` | Set to `yes` if the container will be the one on charge of initialize the cluster. This node will also be part of the cluster. | -| `REDIS_CLUSTER_REPLICAS` | Number of replicas for every master that the cluster will have. | -| `REDIS_NODES` | String delimited by spaces containing the hostnames of all of the nodes that will be part of the cluster | -| `REDIS_CLUSTER_ANNOUNCE_IP` | IP that the node should announce, used for non dynamic ip environments | -| `REDIS_CLUSTER_ANNOUNCE_PORT` | Port that the node should announce, used for non dynamic ip environments. | -| `REDIS_CLUSTER_ANNOUNCE_HOSTNAME` | Hostname that node should announce, used for non dynamic ip environments. | -| `REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE` | Preferred endpoint type which cluster should use, options- ip, hostname | -| `REDIS_CLUSTER_ANNOUNCE_BUS_PORT` | The cluster bus port to announce. | -| `REDIS_CLUSTER_DYNAMIC_IPS` | Set to `no` if your Redis(R) cluster will be created with statical IPs. Default: `yes` | -| `REDIS_TLS_ENABLED` | Whether to enable TLS for traffic or not. Defaults to `no`. | -| `REDIS_TLS_PORT_NUMBER` | Port used for TLS secure traffic. Defaults to `6379`. | -| `REDIS_TLS_CERT_FILE` | File containing the certificate file for the TLS traffic. No defaults. | -| `REDIS_TLS_KEY_FILE` | File containing the key for certificate. No defaults. | -| `REDIS_TLS_CA_FILE` | File containing the CA of the certificate. No defaults. | -| `REDIS_TLS_DH_PARAMS_FILE` | File containing DH params (in order to support DH based ciphers). No defaults. | -| `REDIS_TLS_AUTH_CLIENTS` | Whether to require clients to authenticate or not. Defaults to `yes`. | -| `REDIS_CLUSTER_SLEEP_BEFORE_DNS_LOOKUP` | Number of seconds to wait before initializing the cluster. Set this to a higher value if you sometimes have issues with initial cluster creation. Defaults to `0`. | -| `REDIS_CLUSTER_DNS_LOOKUP_RETRIES` | Number of retries for the node's DNS lookup during the initial cluster creation. Defaults to `5`. | -| `REDIS_CLUSTER_DNS_LOOKUP_SLEEP` | Number of seconds to wait between each node's DNS lookup during the initial cluster creation. Defaults to `1`. | -| `REDIS_IO_THREADS` | Number of threads to implement multithreading operations. Defaults to `1`. | -| `REDIS_IO_THREADS_DO_READS` | Enables multithreading for read operations. Defaults to `false`. | +| Name | Description | +|-----------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `REDIS_DISABLE_COMMANDS` | Disables the specified Redis(R) commands | +| `REDIS_PORT_NUMBER` | Set the Redis(R) port. Default=: `6379` | +| `REDIS_PASSWORD` | Set the Redis(R) password. Default: `bitnami` | +| `ALLOW_EMPTY_PASSWORD` | Enables access without password | +| `REDIS_DNS_RETRIES` | Number of retries to get the IPs of the provided `REDIS_NODES`. It will wait 5 seconds between retries | +| `REDISCLI_AUTH` | Provide the same value as the configured `REDIS_PASSWORD` for the redis-cli tool to authenticate | +| `REDIS_CLUSTER_CREATOR` | Set to `yes` if the container will be the one on charge of initialize the cluster. This node will also be part of the cluster. | +| `REDIS_CLUSTER_REPLICAS` | Number of replicas for every master that the cluster will have. | +| `REDIS_NODES` | String delimited by spaces containing the hostnames of all of the nodes that will be part of the cluster | +| `REDIS_CLUSTER_ANNOUNCE_IP` | IP that the node should announce, used for non dynamic ip environments | +| `REDIS_CLUSTER_ANNOUNCE_PORT` | Port that the node should announce, used for non dynamic ip environments. | +| `REDIS_CLUSTER_ANNOUNCE_HOSTNAME` | Hostname that node should announce, used for non dynamic ip environments. | +| `REDIS_CLUSTER_PREFERRED_ENDPOINT_TYPE` | Preferred endpoint type which cluster should use, options- ip, hostname | +| `REDIS_CLUSTER_ANNOUNCE_BUS_PORT` | The cluster bus port to announce. | +| `REDIS_CLUSTER_DYNAMIC_IPS` | Set to `no` if your Redis(R) cluster will be created with statical IPs. Default: `yes` | +| `REDIS_TLS_ENABLED` | Whether to enable TLS for traffic or not. Defaults to `no`. | +| `REDIS_TLS_PORT_NUMBER` | Port used for TLS secure traffic. Defaults to `6379`. | +| `REDIS_TLS_CERT_FILE` | File containing the certificate file for the TLS traffic. No defaults. | +| `REDIS_TLS_KEY_FILE` | File containing the key for certificate. No defaults. | +| `REDIS_TLS_CA_FILE` | File containing the CA of the certificate. No defaults. | +| `REDIS_TLS_DH_PARAMS_FILE` | File containing DH params (in order to support DH based ciphers). No defaults. | +| `REDIS_TLS_AUTH_CLIENTS` | Whether to require clients to authenticate or not. Defaults to `yes`. | +| `REDIS_CLUSTER_SLEEP_BEFORE_DNS_LOOKUP` | Number of seconds to wait before initializing the cluster. Set this to a higher value if you sometimes have issues with initial cluster creation. Defaults to `0`. | +| `REDIS_CLUSTER_DNS_LOOKUP_RETRIES` | Number of retries for the node's DNS lookup during the initial cluster creation. Defaults to `5`. | +| `REDIS_CLUSTER_DNS_LOOKUP_SLEEP` | Number of seconds to wait between each node's DNS lookup during the initial cluster creation. Defaults to `1`. | +| `REDIS_IO_THREADS` | Number of threads to implement multithreading operations. Defaults to `1`. | +| `REDIS_IO_THREADS_DO_READS` | Enables multithreading for read operations. Defaults to `false`. | | `REDIS_RDB_POLICY` | Set this variable to enable RDB persistent storage RDB data synchronization strategy configuration example `900#1 300#10 60#1000` Defaults to disable RDB persistent storage. | Once all the Redis(R) nodes are running you need to execute command like the following to initiate the cluster: