From 2cd04cc7feb4d92f57d263e3414da2c237899ce5 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 4 Oct 2024 13:25:35 +0000 Subject: [PATCH] [bitnami/mariadb] Release mariadb-10.11.9-debian-12-r2 Signed-off-by: Bitnami Bot --- bitnami/mariadb/10.11/debian-12/Dockerfile | 6 +-- .../opt/bitnami/.bitnami_components.json | 2 +- .../rootfs/opt/bitnami/scripts/libmariadb.sh | 52 ++++++++----------- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/bitnami/mariadb/10.11/debian-12/Dockerfile b/bitnami/mariadb/10.11/debian-12/Dockerfile index 6c60cc689be6b..d15e98043bf15 100644 --- a/bitnami/mariadb/10.11/debian-12/Dockerfile +++ b/bitnami/mariadb/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-09-04T12:21:55Z" \ + org.opencontainers.image.created="2024-10-04T13:03:26Z" \ 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="10.11.9-debian-12-r1" \ + org.opencontainers.image.ref.name="10.11.9-debian-12-r2" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaio1 libaudit1 libcap-ng0 libcrypt1 libgcc-s1 libicu72 liblzma5 libncurses6 libpam0g libssl3 libstdc++6 libtinfo6 libxml2 procps psmisc zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.7-3-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.7-5-linux-${OS_ARCH}-debian-12" \ "mariadb-10.11.9-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index a20539eb2ac38..cc71a8214510b 100644 --- a/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.11/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.4.7-3" + "version": "1.4.7-5" }, "mariadb": { "arch": "amd64", diff --git a/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh index 0ccfe7d1c1c1a..9d6bd864f4513 100644 --- a/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/10.11/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -185,47 +185,38 @@ EOF # None ######################### mysql_exec_initial_dump() { - info "MySQL dump master data start..." + local -r dump_file="${DB_DATA_DIR}/dump_all_databases.sql" - info "LOCK MASTER DATABASES FOR WRITE OPERATIONS..." - mysql -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" -se 'FLUSH TABLES WITH READ LOCK;' + info "MariaDB dump master data start..." + debug "Lock master databases for write operations" + echo "FLUSH TABLES WITH READ LOCK;" | mysql_remote_execute "$DB_MASTER_HOST" "$DB_MASTER_PORT_NUMBER" "mysql" "$DB_MASTER_ROOT_USER" "$DB_MASTER_ROOT_PASSWORD" - info "SHOW MASTER STATUS..." - read -r MYSQL_FILE MYSQL_POSITION <<< "$(mysql -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" -se 'SHOW MASTER STATUS;' | awk 'NR==1 {print $1, $2}')" - info "File: $MYSQL_FILE and Position: $MYSQL_POSITION" + read -r log_file log_position <<< "$(echo "SHOW MASTER STATUS;" | mysql_remote_execute_print_output "$DB_MASTER_HOST" "$DB_MASTER_PORT_NUMBER" "mysql" "$DB_MASTER_ROOT_USER" "$DB_MASTER_ROOT_PASSWORD" | awk 'NR==1 {print $1, $2}')" + debug "File: $log_file and Position: $log_position" - info "Start dump process databases" + debug "Start dump process databases" + mysqldump --verbose --all-databases -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" > "$dump_file" + debug "Finish dump databases" - FILE_LOCATION="$DB_DATA_DIR/dump_all_databases.sql" - - mysqldump --verbose --all-databases -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" > "$FILE_LOCATION" - - info "Finish dump databases" - - info "UNLOCK MASTER DATABASES FOR WRITE OPERATIONS..." - mysql -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" -se 'UNLOCK TABLES;' - - info "Start import dump databases" - mysql_execute < "$FILE_LOCATION" - info "Finish import dump databases" + debug "Unlock master databases for write operations" + echo "UNLOCK TABLES;" | mysql_remote_execute "$DB_MASTER_HOST" "$DB_MASTER_PORT_NUMBER" "mysql" "$DB_MASTER_ROOT_USER" "$DB_MASTER_ROOT_PASSWORD" + debug "Start import dump databases" + mysql_execute < "$dump_file" mysql_execute "mysql" <