diff --git a/bitnami/redis/6.2/debian-11/Dockerfile b/bitnami/redis/6.2/debian-11/Dockerfile index 777282523d51..b624777c8e09 100644 --- a/bitnami/redis/6.2/debian-11/Dockerfile +++ b/bitnami/redis/6.2/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="6.2.7-debian-11-r58" \ + org.opencontainers.image.ref.name="6.2.7-debian-11-r59" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/redis" \ org.opencontainers.image.title="redis" \ org.opencontainers.image.vendor="VMware, Inc." \ 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 8751f23cde97..bbb02ba71b95 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 @@ -206,9 +206,9 @@ redis_validate() { fi fi if is_boolean_yes "$REDIS_TLS_ENABLED"; then - if [[ "$REDIS_PORT_NUMBER" == "$REDIS_TLS_PORT" ]] && [[ "$REDIS_PORT_NUMBER" != "6379" ]]; then + if [[ "$REDIS_PORT_NUMBER" == "$REDIS_TLS_PORT_NUMBER" ]] && [[ "$REDIS_PORT_NUMBER" != "6379" ]]; then # If both ports are assigned the same numbers and they are different to the default settings - print_validation_error "Environment variables REDIS_PORT_NUMBER and REDIS_TLS_PORT point to the same port number (${REDIS_PORT_NUMBER}). Change one of them or disable non-TLS traffic by setting REDIS_PORT_NUMBER=0" + print_validation_error "Environment variables REDIS_PORT_NUMBER and REDIS_TLS_PORT_NUMBER point to the same port number (${REDIS_PORT_NUMBER}). Change one of them or disable non-TLS traffic by setting REDIS_PORT_NUMBER=0" fi if [[ -z "$REDIS_TLS_CERT_FILE" ]]; then print_validation_error "You must provide a X.509 certificate in order to use TLS" @@ -402,13 +402,13 @@ redis_configure_default() { redis_conf_set port "$REDIS_PORT_NUMBER" # TLS configuration if is_boolean_yes "$REDIS_TLS_ENABLED"; then - if [[ "$REDIS_PORT_NUMBER" == "6379" ]] && [[ "$REDIS_TLS_PORT" == "6379" ]]; then + if [[ "$REDIS_PORT_NUMBER" == "6379" ]] && [[ "$REDIS_TLS_PORT_NUMBER" == "6379" ]]; then # If both ports are set to default values, enable TLS traffic only redis_conf_set port 0 - redis_conf_set tls-port "$REDIS_TLS_PORT" + redis_conf_set tls-port "$REDIS_TLS_PORT_NUMBER" else # Different ports were specified - redis_conf_set tls-port "$REDIS_TLS_PORT" + redis_conf_set tls-port "$REDIS_TLS_PORT_NUMBER" fi redis_conf_set tls-cert-file "$REDIS_TLS_CERT_FILE" redis_conf_set tls-key-file "$REDIS_TLS_KEY_FILE" diff --git a/bitnami/redis/README.md b/bitnami/redis/README.md index 5fe795ee059a..e2ee421d5b11 100644 --- a/bitnami/redis/README.md +++ b/bitnami/redis/README.md @@ -439,14 +439,14 @@ The above command scales up the number of replicas to `3`. You can scale down in Starting with version 6, Redis(R) adds the support for SSL/TLS connections. Should you desire to enable this optional feature, you may use the following environment variables to configure the application: - `REDIS_TLS_ENABLED`: Whether to enable TLS for traffic or not. Defaults to `no`. - - `REDIS_TLS_PORT`: Port used for TLS secure traffic. Defaults to `6379`. + - `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`. -When enabling TLS, conventional standard traffic is disabled by default. However this new feature is not mutually exclusive, which means it is possible to listen to both TLS and non-TLS connection simultaneously. To enable non-TLS traffic, set `REDIS_TLS_PORT` to another port different than `0`. +When enabling TLS, conventional standard traffic is disabled by default. However this new feature is not mutually exclusive, which means it is possible to listen to both TLS and non-TLS connection simultaneously. To enable non-TLS traffic, set `REDIS_TLS_PORT_NUMBER` to another port different than `0`. 1. Using `docker run`