From 7ce983b05e8048ea0f2df9528083d3115a0aa808 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 2 Sep 2024 02:50:46 +0200 Subject: [PATCH] [bitnami/mariadb-galera] Release mariadb-galera-10.11.9-debian-12-r1 (#71680) Signed-off-by: Bitnami Bot --- bitnami/mariadb-galera/10.11/debian-12/Dockerfile | 4 ++-- .../mariadb-galera/10.11/debian-12/docker-compose-ldap.yml | 2 -- bitnami/mariadb-galera/10.11/debian-12/docker-compose.yml | 2 -- .../debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh | 4 +--- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bitnami/mariadb-galera/10.11/debian-12/Dockerfile b/bitnami/mariadb-galera/10.11/debian-12/Dockerfile index decd866204cb..8ab9f37f3ad2 100644 --- a/bitnami/mariadb-galera/10.11/debian-12/Dockerfile +++ b/bitnami/mariadb-galera/10.11/debian-12/Dockerfile @@ -7,11 +7,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-08-14T11:03:31Z" \ + org.opencontainers.image.created="2024-09-02T00:19:49Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.11.9-debian-12-r0" \ + org.opencontainers.image.ref.name="10.11.9-debian-12-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="Broadcom, Inc." \ diff --git a/bitnami/mariadb-galera/10.11/debian-12/docker-compose-ldap.yml b/bitnami/mariadb-galera/10.11/debian-12/docker-compose-ldap.yml index 6275bb4c032d..4623510bee8b 100644 --- a/bitnami/mariadb-galera/10.11/debian-12/docker-compose-ldap.yml +++ b/bitnami/mariadb-galera/10.11/debian-12/docker-compose-ldap.yml @@ -1,8 +1,6 @@ # Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 -version: '2.1' - services: mariadb-galera: image: docker.io/bitnami/mariadb-galera:10.11 diff --git a/bitnami/mariadb-galera/10.11/debian-12/docker-compose.yml b/bitnami/mariadb-galera/10.11/debian-12/docker-compose.yml index db0bade8449a..0b13578dfae7 100644 --- a/bitnami/mariadb-galera/10.11/debian-12/docker-compose.yml +++ b/bitnami/mariadb-galera/10.11/debian-12/docker-compose.yml @@ -1,8 +1,6 @@ # Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 -version: '2.1' - services: mariadb-galera: image: docker.io/bitnami/mariadb-galera:10.11 diff --git a/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh index b320d52c003f..bcc87062face 100644 --- a/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh +++ b/bitnami/mariadb-galera/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh @@ -2204,9 +2204,7 @@ mysql_client_extra_opts() { done else # Skip SSL validation - if [[ "$(mysql_client_flavor)" = "mysql" ]]; then - opts+=("--ssl-mode=DISABLED") - else + if [[ "$(mysql_client_flavor)" = "mariadb" ]]; then # SSL connections are enabled by default in MariaDB >=10.11 local mysql_version="" local major_version=""