From 38a3bd086981c57b135bce8b3cd523af013743f3 Mon Sep 17 00:00:00 2001 From: Codex Date: Sat, 18 Jul 2026 00:17:31 +0200 Subject: [PATCH] Make RC backup command cwd independent --- backend/tests/test_rc_backup_restore_scripts.py | 2 ++ scripts/backup_release_state.sh | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/tests/test_rc_backup_restore_scripts.py b/backend/tests/test_rc_backup_restore_scripts.py index e0e6549c..ae02b3ef 100644 --- a/backend/tests/test_rc_backup_restore_scripts.py +++ b/backend/tests/test_rc_backup_restore_scripts.py @@ -20,6 +20,8 @@ def test_backup_is_atomic_read_only_and_checksum_bound() -> None: assert "--no-owner" in script assert "CHECKSUMS.sha256" in script assert "database-password" not in script.lower() + assert 'git -C "$ROOT" rev-parse HEAD' in script + assert 'git -C "$ROOT" status --porcelain=v1' in script assert "mv \"$PARTIAL\" \"$FINAL\"" in script assert "rm -rf -- \"$PARTIAL\"" in script assert "DROP DATABASE" not in script diff --git a/scripts/backup_release_state.sh b/scripts/backup_release_state.sh index c536c66e..6b359f5f 100644 --- a/scripts/backup_release_state.sh +++ b/scripts/backup_release_state.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -euo pipefail +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" CONTAINER="geointel" OUTPUT_ROOT="backups" RELEASE_ID="rc-$(date -u +%Y%m%dT%H%M%SZ)" @@ -112,9 +113,9 @@ test -s "$PARTIAL/database.list" IMAGE_ID="$(docker inspect -f '{{.Image}}' "$CONTAINER")" IMAGE_NAME="$(docker inspect -f '{{.Config.Image}}' "$CONTAINER")" -GIT_COMMIT="$(git rev-parse HEAD)" +GIT_COMMIT="$(git -C "$ROOT" rev-parse HEAD)" GIT_DIRTY="false" -if [ -n "$(git status --porcelain=v1)" ]; then +if [ -n "$(git -C "$ROOT" status --porcelain=v1)" ]; then GIT_DIRTY="true" fi