From 9fb9c677a5ab1af439cb77b8e81ab43745e8f219 Mon Sep 17 00:00:00 2001
From: Tobias Janke <git@tojanke.de>
Date: Sun, 8 Dec 2024 17:28:46 +0100
Subject: [PATCH] Use better suited dump option skip-dump-date that does not
break automatic database detection on restore
---
backup.sh | 8 +-------
docker-compose.yaml | 1 -
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/backup.sh b/backup.sh
index ead820e..44b0b56 100755
--- a/backup.sh
+++ b/backup.sh
@@ -29,13 +29,7 @@ do
echo "==> Dumping database: $db"
FILENAME=/backup/$DATE.$db.sql
LATEST=/backup/latest.$db.sql
- BASIC_OPTS="--single-transaction"
- if [ -n "$REMOVE_DUPLICATES" ]
- then
- echo "WARNING: disabling comments in backup to remove deuplicate backups. Automatic database name detection won't work so set MYSQL_DATABASE on restore"
- BASIC_OPTS="$BASIC_OPTS" --skip-comments
- fi
- if mysqldump $BASIC_OPTS $MYSQLDUMP_OPTS -h "$MYSQL_HOST" -P "$MYSQL_PORT" -u "$MYSQL_USER" -p"$MYSQL_PASS" $MYSQL_SSL_OPTS "$db" > "$FILENAME"
+ if mysqldump --single-transaction --skip-dump-date $MYSQLDUMP_OPTS -h "$MYSQL_HOST" -P "$MYSQL_PORT" -u "$MYSQL_USER" -p"$MYSQL_PASS" $MYSQL_SSL_OPTS "$db" > "$FILENAME"
then
EXT=
if [ -z "${USE_PLAIN_SQL}" ]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 64dcef0..5ac0e9d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -30,7 +30,6 @@ services:
environment:
- MYSQL_HOST=my_mariadb
- MYSQL_USER=root
- - MYSQL_DATABASE=${DATABASE_NAME}
- MYSQL_PASS=${MARIADB_ROOT_PASSWORD}
- MAX_BACKUPS=1
- INIT_BACKUP=1