mirror of
https://github.com/bitnami/containers.git
synced 2026-02-14 08:37:21 +08:00
[bitnami/redis-cluster] Release 7.0.11-debian-11-r16 (#36305)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -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-05-31T04:50:36Z" \
|
||||
org.opencontainers.image.created="2023-06-03T05:07:05Z" \
|
||||
org.opencontainers.image.description="Application packaged by VMware, Inc" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="7.0.11-debian-11-r15" \
|
||||
org.opencontainers.image.ref.name="7.0.11-debian-11-r16" \
|
||||
org.opencontainers.image.title="redis-cluster" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="7.0.11"
|
||||
|
||||
@@ -265,7 +265,7 @@ redis_configure_replication() {
|
||||
local -a sentinel_info_command=("redis-cli" "-h" "${REDIS_SENTINEL_HOST}" "-p" "${REDIS_SENTINEL_PORT_NUMBER}")
|
||||
is_boolean_yes "$REDIS_TLS_ENABLED" && sentinel_info_command+=("--tls" "--cert" "${REDIS_TLS_CERT_FILE}" "--key" "${REDIS_TLS_KEY_FILE}" "--cacert" "${REDIS_TLS_CA_FILE}")
|
||||
sentinel_info_command+=("sentinel" "get-master-addr-by-name" "${REDIS_SENTINEL_MASTER_NAME}")
|
||||
read -r -a REDIS_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}")"
|
||||
read -r -a REDIS_SENTINEL_INFO <<< "$("${sentinel_info_command[@]}" | tr '\n' ' ')"
|
||||
REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]}
|
||||
REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]}
|
||||
fi
|
||||
|
||||
@@ -143,7 +143,7 @@ redis_cluster_create() {
|
||||
|
||||
for node in "${nodes[@]}"; do
|
||||
read -r -a host_and_port <<< "$(to_host_and_port "$node")"
|
||||
wait_command="timeout -v 5 redis-cli -h ${host_and_port[0]} -p ${host_and_port[1]} ping"
|
||||
wait_command="timeout 5 redis-cli -h ${host_and_port[0]} -p ${host_and_port[1]} ping"
|
||||
if is_boolean_yes "$REDIS_TLS_ENABLED"; then
|
||||
wait_command="${wait_command:0:-5} --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} ping"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user