diff --git a/bitnami/mariadb/10.6/debian-11/Dockerfile b/bitnami/mariadb/10.6/debian-11/Dockerfile index 97ef91a19c0b..12a569063b30 100644 --- a/bitnami/mariadb/10.6/debian-11/Dockerfile +++ b/bitnami/mariadb/10.6/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-12-18T20:19:34Z" \ + org.opencontainers.image.created="2024-01-17T20:40:36Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.6.16-debian-11-r2" \ + org.opencontainers.image.ref.name="10.6.16-debian-11-r3" \ org.opencontainers.image.title="mariadb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.6.16" @@ -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 libicu67 liblzma5 libncurses6 libpam0g libssl1.1 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-4-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-5-linux-${OS_ARCH}-debian-11" \ "mariadb-10.6.16-2-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index d68b744735b3..d05b53798ca8 100644 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-4" + "version": "1.4.6-5" }, "mariadb": { "arch": "amd64", diff --git a/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mariadb/10.6/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-y}" +fail_if_not_present="${3:-n}" if test -f "$script"; then sh $script diff --git a/bitnami/mariadb/10.6/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.6/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh index 192984bec0a0..bba902411336 100644 --- a/bitnami/mariadb/10.6/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh +++ b/bitnami/mariadb/10.6/debian-11/rootfs/opt/bitnami/scripts/libmariadb.sh @@ -178,6 +178,49 @@ pid_file=${DB_PID_FILE} EOF } +######################## +# Make a dump on master database and update slave database +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +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" <