From b256ba175b4c45f1e50d8a4decc6fb85587b698e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 20 Mar 2024 13:30:06 +0100 Subject: [PATCH] [bitnami/mariadb] Release 11.1.4-debian-12-r5 (#63937) Signed-off-by: Bitnami Containers --- bitnami/mariadb/11.1/debian-12/Dockerfile | 6 +- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libbitnami.sh | 1 + .../rootfs/opt/bitnami/scripts/libmariadb.sh | 68 +++++++++++-------- 4 files changed, 45 insertions(+), 32 deletions(-) diff --git a/bitnami/mariadb/11.1/debian-12/Dockerfile b/bitnami/mariadb/11.1/debian-12/Dockerfile index bfade074e6ff..dfc6fed083be 100644 --- a/bitnami/mariadb/11.1/debian-12/Dockerfile +++ b/bitnami/mariadb/11.1/debian-12/Dockerfile @@ -7,10 +7,10 @@ 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-02-21T12:23:58Z" \ + org.opencontainers.image.created="2024-03-20T11:57:50Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="11.1.4-debian-12-r4" \ + org.opencontainers.image.ref.name="11.1.4-debian-12-r5" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="11.1.4" @@ -26,7 +26,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.6-9-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.6-10-linux-${OS_ARCH}-debian-12" \ "mariadb-11.1.4-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 142bace413c3..3ea82444b19c 100644 --- a/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.4.6-9" + "version": "1.4.6-10" }, "mariadb": { "arch": "amd64", diff --git a/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 3853c789b2ea..aa782fc6a4db 100644 --- a/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/mariadb/11.1/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -48,6 +48,7 @@ print_image_welcome_page() { info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}" info "" } diff --git a/bitnami/mariadb/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh index bba902411336..990bfe631117 100644 --- a/bitnami/mariadb/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/11.1/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -189,35 +189,45 @@ EOF ######################### mysql_exec_initial_dump() { info "MySQL dump master data start..." - mysql -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" -e 'RESET MASTER;' - databases=("mysql") - if [ -n "$DB_DATABASE" ]; then - databases+=("$DB_DATABASE") - fi - for DB in "${databases[@]}"; do - info "Start dump process database $DB" - if [[ $DB = @(information_schema|performance_schema|sys) ]]; then - info "Skipping default table $DB to be imported" - continue - fi - DUMP_FILE="$DB_DATA_DIR/dump_$DB.sql" - if mysqldump --verbose -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" "$DB" > "$DUMP_FILE"; then - info "Finish dump database $DB" - info "Ensure database exists $DB" - mysql -u "$DB_MASTER_ROOT_USER" < "$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" + + mysql_execute "mysql" <