From 2b83b902fb98b4042ad348e54d9d3aa836c6c8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Martos?= Date: Mon, 25 Apr 2022 13:40:17 +0200 Subject: [PATCH] Add support for IPv6 in the Bitnami ZooKeeper containers (#80) * Add support for IPv6 in the Bitnami Zookeeper containers Signed-off-by: Jota Martos --- .../3.5/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh | 4 ++-- .../3.6/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh | 4 ++-- .../3.7/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh | 4 ++-- .../3.8/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bitnami/zookeeper/3.5/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh b/bitnami/zookeeper/3.5/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh index 743b0e370904..b27955875179 100644 --- a/bitnami/zookeeper/3.5/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh +++ b/bitnami/zookeeper/3.5/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh @@ -89,11 +89,11 @@ zookeeper_validate() { read -r -a zookeeper_servers_list <<<"${ZOO_SERVERS//[;, ]/ }" for server in "${zookeeper_servers_list[@]}"; do if is_boolean_yes "$server_id_with_jumps"; then - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+::[1-9][0-9]*$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+::[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port::id. Example: zookeeper:2888:3888::1" fi else - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port. Example: zookeeper:2888:3888" fi fi diff --git a/bitnami/zookeeper/3.6/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh b/bitnami/zookeeper/3.6/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh index 743b0e370904..b27955875179 100644 --- a/bitnami/zookeeper/3.6/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh +++ b/bitnami/zookeeper/3.6/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh @@ -89,11 +89,11 @@ zookeeper_validate() { read -r -a zookeeper_servers_list <<<"${ZOO_SERVERS//[;, ]/ }" for server in "${zookeeper_servers_list[@]}"; do if is_boolean_yes "$server_id_with_jumps"; then - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+::[1-9][0-9]*$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+::[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port::id. Example: zookeeper:2888:3888::1" fi else - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port. Example: zookeeper:2888:3888" fi fi diff --git a/bitnami/zookeeper/3.7/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh b/bitnami/zookeeper/3.7/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh index 743b0e370904..b27955875179 100644 --- a/bitnami/zookeeper/3.7/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh +++ b/bitnami/zookeeper/3.7/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh @@ -89,11 +89,11 @@ zookeeper_validate() { read -r -a zookeeper_servers_list <<<"${ZOO_SERVERS//[;, ]/ }" for server in "${zookeeper_servers_list[@]}"; do if is_boolean_yes "$server_id_with_jumps"; then - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+::[1-9][0-9]*$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+::[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port::id. Example: zookeeper:2888:3888::1" fi else - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port. Example: zookeeper:2888:3888" fi fi diff --git a/bitnami/zookeeper/3.8/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh b/bitnami/zookeeper/3.8/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh index 743b0e370904..b27955875179 100644 --- a/bitnami/zookeeper/3.8/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh +++ b/bitnami/zookeeper/3.8/debian-10/rootfs/opt/bitnami/scripts/libzookeeper.sh @@ -89,11 +89,11 @@ zookeeper_validate() { read -r -a zookeeper_servers_list <<<"${ZOO_SERVERS//[;, ]/ }" for server in "${zookeeper_servers_list[@]}"; do if is_boolean_yes "$server_id_with_jumps"; then - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+::[1-9][0-9]*$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+::[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port::id. Example: zookeeper:2888:3888::1" fi else - if ! echo "$server" | grep -q -E "^[^:]+:[^:]+:[^:]+$"; then + if ! echo "$server" | grep -q -E "^[^[:space:]]+:[[:digit:]]+:[[:digit:]]+$"; then print_validation_error "Zookeeper server ${server} should follow the next syntax: host:port:port. Example: zookeeper:2888:3888" fi fi