From c610c06a0e765e375323c19855435ea6766ec6cf Mon Sep 17 00:00:00 2001 From: AIIrondev Date: Thu, 16 Jul 2026 14:40:06 +0200 Subject: [PATCH] changes for the backup process --- backup.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/backup.sh b/backup.sh index 35d3ed0..caa79c3 100755 --- a/backup.sh +++ b/backup.sh @@ -1,4 +1,4 @@ -cat << 'EOF' > backup.sh +sudo tee backup.sh > /dev/null << 'EOF' #!/usr/bin/env bash set -euo pipefail @@ -101,22 +101,28 @@ docker_backup() { output_dir="/tmp/invoice_archive_${timestamp}" remote_base="${output_dir}/${BASE_NAME}" - # Führt das Skript im Container mit dem exakten Pfad aus - docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir" && \ + # 1. Ordner im Container erstellen + docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir" + + # 2. Python-Backup ausführen docker compose -f "$COMPOSE_FILE" exec -T app python3 /app/Web/modules/inventarsystem/backup_invoices.py \ --archive-dir "$output_dir" \ - --base-name "$BASE_NAME" && \ - mkdir -p "$INVOICE_ARCHIVE_DIR" && \ - docker cp "$app_container":"${remote_base}.jsonl" "$INVOICE_ARCHIVE_DIR/" && \ - docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/" && \ - docker cp "$app_container":"${remote_base}.meta.json" "$INVOICE_ARCHIVE_DIR/" + --base-name "$BASE_NAME" - local backup_status=$? + # 3. Prüfen, ob eine Backup-Datei erzeugt wurde, bevor wir kopieren + if docker compose -f "$COMPOSE_FILE" exec -T app test -f "${remote_base}.jsonl"; then + mkdir -p "$INVOICE_ARCHIVE_DIR" + docker cp "$app_container":"${remote_base}.jsonl" "$INVOICE_ARCHIVE_DIR/" + docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/" + docker cp "$app_container":"${remote_base}.meta.json" "$INVOICE_ARCHIVE_DIR/" + log_message="Backup files successfully copied to host." + else + echo "No backup files to copy (database empty). Skipping file transfer." + fi - # Aufräumen (läuft unabhängig vom Erfolg des Backups) + # Aufräumen im Container docker compose -f "$COMPOSE_FILE" exec -T app rm -rf "$output_dir" - - return $backup_status + return 0 } main() {