diff --git a/bitnami/mysql/8.0/debian-11/Dockerfile b/bitnami/mysql/8.0/debian-11/Dockerfile index a0b7287a080f..88d3f44f61a9 100644 --- a/bitnami/mysql/8.0/debian-11/Dockerfile +++ b/bitnami/mysql/8.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-07-18T13:58:56Z" \ + org.opencontainers.image.created="2023-07-20T14:58:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.34-debian-11-r0" \ + org.opencontainers.image.ref.name="8.0.34-debian-11-r2" \ org.opencontainers.image.title="mysql" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.0.34" diff --git a/bitnami/mysql/8.0/debian-11/docker-compose.yml b/bitnami/mysql/8.0/debian-11/docker-compose.yml index 5214e12f21d0..603fc2689ae3 100644 --- a/bitnami/mysql/8.0/debian-11/docker-compose.yml +++ b/bitnami/mysql/8.0/debian-11/docker-compose.yml @@ -5,7 +5,7 @@ version: '2.1' services: mysql: - image: mysql + image: docker.io/bitnami/mysql:8.0 ports: - '3306:3306' volumes: diff --git a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 3c6a4109c2c5..54987abca42a 100644 --- a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -187,6 +187,25 @@ validate_port() { fi } +######################## +# Validate if the provided argument is a valid IPv6 address +# Arguments: +# $1 - IP to validate +# Returns: +# Boolean +######################### +validate_ipv6() { + local ip="${1:?ip is missing}" + local stat=1 + local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$' + local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$' + + if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then + stat=0 + fi + return "$stat" +} + ######################## # Validate if the provided argument is a valid IPv4 address # Arguments: @@ -204,7 +223,26 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return $stat + return "$stat" +} + +######################## +# Validate if the provided argument is a valid IPv4 or IPv6 address +# Arguments: +# $1 - IP to validate +# Returns: +# Boolean +######################### +validate_ip() { + local ip="${1:?ip is missing}" + local stat=1 + + if validate_ipv4 "$ip"; then + stat=0 + else + stat=$(validate_ipv6 "$ip") + fi + return "$stat" } ######################## diff --git a/bitnami/mysql/docker-compose.yml b/bitnami/mysql/docker-compose.yml index 5214e12f21d0..603fc2689ae3 100644 --- a/bitnami/mysql/docker-compose.yml +++ b/bitnami/mysql/docker-compose.yml @@ -5,7 +5,7 @@ version: '2.1' services: mysql: - image: mysql + image: docker.io/bitnami/mysql:8.0 ports: - '3306:3306' volumes: