From 56bd3fa123a195f251aceb9243dd05caa7f7b0b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 12:29:05 +0000 Subject: [PATCH 1/3] chore(deps): bump mysql from 8.0.31 to 8.0.32 Bumps mysql from 8.0.31 to 8.0.32. --- updated-dependencies: - dependency-name: mysql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cf7d17f..760ec5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM mysql:8.0.31 +FROM mysql:8.0.32 From fce19e6116a562a3afff9759c652c864efc5a3f8 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Tue, 7 Feb 2023 07:42:20 -0500 Subject: [PATCH 2/3] docs: update version in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2846dc1..fa52956 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dokku mysql [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-mysql/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-mysql/actions/workflows/ci.yml?query=branch%3Amaster) [![IRC Network](https://img.shields.io/badge/irc-libera-blue.svg?style=flat-square "IRC Libera")](https://webchat.libera.chat/?channels=dokku) -Official mysql plugin for dokku. Currently defaults to installing [mysql 8.0.31](https://hub.docker.com/_/mysql/). +Official mysql plugin for dokku. Currently defaults to installing [mysql 8.0.32](https://hub.docker.com/_/mysql/). ## Requirements From 9354d90156d7ca969a2c6a643b83cec23335dfac Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sun, 5 Mar 2023 04:46:02 -0500 Subject: [PATCH 3/3] refactor: use root credentials to create database dump This fixes an issue introduced in mysql 8.0.32 where we now need RELOAD and PROCESS to make a dump. Since we already import via root, exporting via root should be fine as well. --- functions | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/functions b/functions index 6fb8567..fd96c97 100755 --- a/functions +++ b/functions @@ -113,12 +113,10 @@ service_export() { local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_NAME="$(get_service_name "$SERVICE")" local DATABASE_NAME="$(get_database_name "$SERVICE")" - local PASSWORD="$(service_password "$SERVICE")" + local ROOTPASSWORD="$(service_root_password "$SERVICE")" [[ -n $SSH_TTY ]] && stty -opost - "$DOCKER_BIN" container exec "$SERVICE_NAME" bash -c "printf '[client]\ndefault-character-set=utf8mb4\npassword=$PASSWORD\n' > /root/credentials.cnf" - "$DOCKER_BIN" container exec "$SERVICE_NAME" mysqldump --defaults-extra-file=/root/credentials.cnf --user=mysql --single-transaction --no-tablespaces --quick "$DATABASE_NAME" - "$DOCKER_BIN" container exec "$SERVICE_NAME" rm /root/credentials.cnf + "$DOCKER_BIN" container exec "$SERVICE_NAME" mysqldump --default-character-set=utf8mb4 --user=root --password="$ROOTPASSWORD" --single-transaction --no-tablespaces --quick "$DATABASE_NAME" status=$? [[ -n $SSH_TTY ]] && stty opost exit $status