public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[bitnami/redis] Release 7.0.5-debian-11-r20 (#14126) 

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2022-11-18 09:07:50 +01:00 committed by GitHub
parent 8def2aebd2
commit 7a10789ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/redis/7.0/debian-11/Dockerfile
View File

@ -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="7.0.5-debian-11-r19" \
org.opencontainers.image.ref.name="7.0.5-debian-11-r20" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/redis" \
org.opencontainers.image.title="redis" \
org.opencontainers.image.vendor="VMware, Inc." \

10
bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh
View File

@ -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"