changes to the backup.sh
This commit is contained in:
@@ -100,10 +100,9 @@ docker_backup() {
|
|||||||
output_dir="/tmp/invoice_archive_${timestamp}"
|
output_dir="/tmp/invoice_archive_${timestamp}"
|
||||||
remote_base="${output_dir}/${BASE_NAME}"
|
remote_base="${output_dir}/${BASE_NAME}"
|
||||||
|
|
||||||
# Wir verketten die kritischen Schritte mit &&.
|
# Erstellt den Ordner, führt das Skript mit dem KORREKTEN Pfad aus und kopiert die Dateien
|
||||||
# Falls der Pfad doch '/app/Web/...' sein sollte, passe ihn hier einfach wieder an.
|
|
||||||
docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir" && \
|
docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir" && \
|
||||||
docker compose -f "$COMPOSE_FILE" exec -T app python3 /app/backup_invoices.py \
|
docker compose -f "$COMPOSE_FILE" exec -T app python3 /app/Web/modules/inventarsystem/backup_invoices.py \
|
||||||
--archive-dir "$output_dir" \
|
--archive-dir "$output_dir" \
|
||||||
--base-name "$BASE_NAME" && \
|
--base-name "$BASE_NAME" && \
|
||||||
mkdir -p "$INVOICE_ARCHIVE_DIR" && \
|
mkdir -p "$INVOICE_ARCHIVE_DIR" && \
|
||||||
@@ -111,13 +110,11 @@ docker_backup() {
|
|||||||
docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/" && \
|
docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/" && \
|
||||||
docker cp "$app_container":"${remote_base}.meta.json" "$INVOICE_ARCHIVE_DIR/"
|
docker cp "$app_container":"${remote_base}.meta.json" "$INVOICE_ARCHIVE_DIR/"
|
||||||
|
|
||||||
# Hier fangen wir den Exit-Code der gesamten Kette ab
|
|
||||||
local backup_status=$?
|
local backup_status=$?
|
||||||
|
|
||||||
# Dieser Befehl läuft immer (Aufräumen im Container), verändert aber nicht unseren Rückgabetatbestand
|
# Räumt den temporären Ordner im Container auf
|
||||||
docker compose -f "$COMPOSE_FILE" exec -T app rm -rf "$output_dir"
|
docker compose -f "$COMPOSE_FILE" exec -T app rm -rf "$output_dir"
|
||||||
|
|
||||||
# Jetzt geben wir den echten Status der Backup-Kette zurück
|
|
||||||
return $backup_status
|
return $backup_status
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user