From b04f30abc530e000e6591d9b2abbd37483006d9c Mon Sep 17 00:00:00 2001 From: "Shkar T. Noori" Date: Mon, 24 Mar 2025 14:05:54 +0300 Subject: [PATCH] Update environment variables and scripts for MariaDB support, replacing MySQL references in Dockerfile, env.sh, and helpers.sh. --- Dockerfile | 2 +- src/env.sh | 2 +- src/helpers.sh | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72dc694..ff457fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ENV DATABASE_USER '' ENV DATABASE_SERVER '' ENV DATABASE_PASSWORD '' ENV PGDUMP_EXTRA_OPTS '' -ENV MYSQLDUMP_EXTRA_OPTS '' +ENV MARIADB_DUMP_EXTRA_OPTS '' ENV S3_ACCESS_KEY_ID '' ENV S3_SECRET_ACCESS_KEY '' ENV S3_BUCKET '' diff --git a/src/env.sh b/src/env.sh index 7061374..414227d 100644 --- a/src/env.sh +++ b/src/env.sh @@ -4,7 +4,7 @@ if [ -z "$S3_BUCKET" ]; then fi if [ -z "$DATABASE_SERVER" ]; then - echo "You need to set the DATABASE_SERVER environment variable. (postgres, mysql)" + echo "You need to set the DATABASE_SERVER environment variable. (postgres, mariadb)" exit 1 fi diff --git a/src/helpers.sh b/src/helpers.sh index b1df664..86762c3 100644 --- a/src/helpers.sh +++ b/src/helpers.sh @@ -4,8 +4,8 @@ backup() { if [[ "$DATABASE_SERVER" == "postgres" ]]; then backup_postgres - elif [[ "$DATABASE_SERVER" == "mysql" ]]; then - backup_mysql + elif [[ "$DATABASE_SERVER" == "mariadb" ]]; then + backup_mariadb else echo "Unknown database server: $DATABASE_SERVER" exit 1 @@ -15,8 +15,8 @@ backup() { restore() { if [[ "$DATABASE_SERVER" == "postgres" ]]; then restore_postgres - elif [[ "$DATABASE_SERVER" == "mysql" ]]; then - restore_mysql + elif [[ "$DATABASE_SERVER" == "mariadb" ]]; then + restore_mariadb else echo "Unknown database server: $DATABASE_SERVER" exit 1 @@ -37,18 +37,18 @@ backup_postgres() { $PGDUMP_EXTRA_OPTS > db.dump } -backup_mysql() { - mysqldump \ +backup_mariadb() { + mariadb-dump \ --host "$DATABASE_HOST" \ --port "$DATABASE_PORT" \ --user "$DATABASE_USER" \ - --password="$DATABASE_PASSWORD" $MYSQLDUMP_EXTRA_OPTS \ + --password="$DATABASE_PASSWORD" $MARIADB_DUMP_EXTRA_OPTS \ $DATABASE_NAME > db.dump } -restore_mysql() { +restore_mariadb() { echo "Restoring from backup..." - mysql \ + mariadb \ -h $DATABASE_HOST \ -P $DATABASE_PORT \ -u $DATABASE_USER \