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 diff --git a/README.md b/README.md index 645fa16..55bbd37 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 diff --git a/functions b/functions index 90cd112..38116ff 100755 --- a/functions +++ b/functions @@ -168,12 +168,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