From 71971e21df643ab2293139ce572a4f212ffb0d6f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 16 Jan 2024 16:05:44 +0100 Subject: [PATCH] [bitnami/mysql] Release 8.0.35-debian-11-r3 (#54806) Signed-off-by: Bitnami Containers --- bitnami/mysql/8.0/debian-11/Dockerfile | 8 ++--- .../opt/bitnami/.bitnami_components.json | 4 +-- .../debian-11/prebuildfs/usr/sbin/run-script | 2 +- .../rootfs/opt/bitnami/scripts/libmysql.sh | 30 +++++-------------- .../rootfs/opt/bitnami/scripts/mysql-env.sh | 5 ++-- 5 files changed, 17 insertions(+), 32 deletions(-) diff --git a/bitnami/mysql/8.0/debian-11/Dockerfile b/bitnami/mysql/8.0/debian-11/Dockerfile index 40b3084fa450..66929554cc24 100644 --- a/bitnami/mysql/8.0/debian-11/Dockerfile +++ b/bitnami/mysql/8.0/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-24T13:30:17Z" \ + org.opencontainers.image.created="2024-01-16T14:27:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.0.35-debian-11-r2" \ + org.opencontainers.image.ref.name="8.0.35-debian-11-r3" \ org.opencontainers.image.title="mysql" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.0.35" @@ -26,8 +26,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl gcc-10 libaio1 libcom-err2 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libsasl2-2 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps psmisc RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ - "mysql-8.0.35-0-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-5-linux-${OS_ARCH}-debian-11" \ + "mysql-8.0.35-1-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index dc53c855288d..84255307b696 100644 --- a/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mysql/8.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-4" + "version": "1.4.6-5" }, "mysql": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.0.35-0" + "version": "8.0.35-1" } } \ No newline at end of file diff --git a/bitnami/mysql/8.0/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mysql/8.0/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/mysql/8.0/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/mysql/8.0/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/mysql/8.0/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/8.0/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh index 10a13c8d416b..bba902411336 100644 --- a/bitnami/mysql/8.0/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh +++ b/bitnami/mysql/8.0/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh @@ -189,51 +189,35 @@ 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 - - FILE_LOCATION="$DB_DATA_DIR/dump_$DB.sql" - - mysqldump --verbose -h "$DB_MASTER_HOST" -P "$DB_MASTER_PORT_NUMBER" -u "$DB_MASTER_ROOT_USER" -p"$DB_MASTER_ROOT_PASSWORD" $DB > $FILE_LOCATION - - info "Finish dump database $DB" - - if [ $? -eq 0 ]; then + 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" <