From fc93e269e538f51e9e20bafb405a07d088d89cf4 Mon Sep 17 00:00:00 2001 From: ttionya Date: Sat, 17 Dec 2022 17:10:26 +0800 Subject: [PATCH] feat: add mariadb-client dependence --- Dockerfile | 3 ++- scripts/backup.sh | 2 +- scripts/restore.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0257c33..193a1fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,8 @@ COPY scripts/*.sh /app/ RUN chmod +x /app/*.sh \ && mkdir -m 777 /bitwarden \ - && apk add --no-cache bash heirloom-mailx p7zip postgresql14-client sqlite supercronic tzdata \ + && apk add --no-cache bash heirloom-mailx mariadb-client p7zip postgresql14-client sqlite supercronic tzdata \ + && apk info --no-cache -Lq mariadb-client | grep -vE '/bin/mariadb$' | grep -vE '/bin/mariadb-dump$' | xargs -I {} rm -f "/{}" \ && ln -sf "${LOCALTIME_FILE}" /etc/localtime \ && addgroup -g "${USER_ID}" "${USER_NAME}" \ && adduser -u "${USER_ID}" -Ds /bin/sh -G "${USER_NAME}" "${USER_NAME}" diff --git a/scripts/backup.sh b/scripts/backup.sh index 0060c3a..d609d19 100644 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -52,7 +52,7 @@ function backup_db_postgresql() { function backup_db_mysql() { color blue "backup vaultwarden mysql database" - mysqldump -h "${MYSQL_HOST}" -P "${MYSQL_PORT}" -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" > "${BACKUP_FILE_DB_MYSQL}" + mariadb-dump -h "${MYSQL_HOST}" -P "${MYSQL_PORT}" -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" > "${BACKUP_FILE_DB_MYSQL}" if [[ $? != 0 ]]; then color red "backup vaultwarden postgresql database failed" diff --git a/scripts/restore.sh b/scripts/restore.sh index 8f7421b..e91d8c3 100644 --- a/scripts/restore.sh +++ b/scripts/restore.sh @@ -90,7 +90,7 @@ function restore_db_postgresql() { function restore_db_mysql() { color blue "restore vaultwarden mysql database" - mysql -h "${MYSQL_HOST}" -P "${MYSQL_PORT}" -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" < "${RESTORE_FILE_DB}" + mariadb -h "${MYSQL_HOST}" -P "${MYSQL_PORT}" -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" < "${RESTORE_FILE_DB}" if [[ $? == 0 ]]; then color green "restore vaultwarden mysql database successful"