From 471c4e0710b08ca84d8d7ca16a14edd8f94b2f45 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 31 Aug 2024 20:47:43 +0200 Subject: [PATCH] [bitnami/mariadb] Release mariadb-11.5.2-debian-12-r1 (#71522) Signed-off-by: Bitnami Bot --- bitnami/mariadb/11.5/debian-12/Dockerfile | 4 ++-- bitnami/mariadb/11.5/debian-12/docker-compose-replication.yml | 2 -- bitnami/mariadb/11.5/debian-12/docker-compose.yml | 2 -- .../11.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh | 4 +--- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bitnami/mariadb/11.5/debian-12/Dockerfile b/bitnami/mariadb/11.5/debian-12/Dockerfile index 121bb0754642..14be8f1cd2cc 100644 --- a/bitnami/mariadb/11.5/debian-12/Dockerfile +++ b/bitnami/mariadb/11.5/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-26T08:12:06Z" \ + org.opencontainers.image.created="2024-08-31T18:16:47Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mariadb/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.5.2-debian-12-r0" \ + org.opencontainers.image.ref.name="11.5.2-debian-12-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="Broadcom, Inc." \ diff --git a/bitnami/mariadb/11.5/debian-12/docker-compose-replication.yml b/bitnami/mariadb/11.5/debian-12/docker-compose-replication.yml index 942f8d90ce40..bf432d5fad93 100644 --- a/bitnami/mariadb/11.5/debian-12/docker-compose-replication.yml +++ b/bitnami/mariadb/11.5/debian-12/docker-compose-replication.yml @@ -1,8 +1,6 @@ # Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 -version: '2.1' - services: mariadb-master: image: docker.io/bitnami/mariadb:11.5 diff --git a/bitnami/mariadb/11.5/debian-12/docker-compose.yml b/bitnami/mariadb/11.5/debian-12/docker-compose.yml index 7d2c7a4503d3..be39533de249 100644 --- a/bitnami/mariadb/11.5/debian-12/docker-compose.yml +++ b/bitnami/mariadb/11.5/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: image: docker.io/bitnami/mariadb:11.5 diff --git a/bitnami/mariadb/11.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/11.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh index 4995143a60c9..0ccfe7d1c1c1 100644 --- a/bitnami/mariadb/11.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/11.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -1410,9 +1410,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=""