From 202ea7356c1e70b47c83eca0405985614bae41f1 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 22 Mar 2026 17:39:45 +0000 Subject: [PATCH 1/6] Small clean up --- README.md | 2 +- docker-compose.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 87dfd8f..d86a23a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Over the past 2 years, this backup setup has enabled me to successfully restore - **Scheduled Backups**: Automates backups according to a defined schedule. - **Log Rotation**: Maintains weekly logs of all backup activities. - **Multi-Repository Backups**: Allows backups to multiple BorgBackup repositories simultaneously. -- **Healtcheck**: The healthcheck is based on the time of the last successful backup. +- **Healthcheck**: The healthcheck is based on the time of the last successful backup. ### Multi-target backups diff --git a/docker-compose.yml b/docker-compose.yml index 5f4b028..7c56ea5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,6 @@ services: image: ghcr.io/schmelczer/backup-container:latest container_name: backup init: true - tty: true environment: - TZ=Europe/London - SLEEP_TIME=1h # we will wait an hour between backups From 5d49069b7b70eaf5e913bdb232de25a12be89f96 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 22 Mar 2026 17:39:50 +0000 Subject: [PATCH 2/6] Safer default --- config/ssh_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ssh_config b/config/ssh_config index 7017c33..a8ed7dd 100644 --- a/config/ssh_config +++ b/config/ssh_config @@ -1,4 +1,4 @@ Host * - StrictHostKeyChecking no + StrictHostKeyChecking accept-new ServerAliveInterval 30 ServerAliveCountMax 3 From 8bc697a7f4ca47b4ee9ccbbbb094e1764393088a Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 22 Mar 2026 17:40:02 +0000 Subject: [PATCH 3/6] Migrate to forgejo --- .forgejo/workflows/docker-publish.yml | 58 +++++++++++++++++++++++++++ .forgejo/workflows/shellcheck.yml | 19 +++++++++ 2 files changed, 77 insertions(+) create mode 100644 .forgejo/workflows/docker-publish.yml create mode 100644 .forgejo/workflows/shellcheck.yml diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml new file mode 100644 index 0000000..4d2b812 --- /dev/null +++ b/.forgejo/workflows/docker-publish.yml @@ -0,0 +1,58 @@ +name: Docker + +on: + push: + branches: [ "main" ] + # Publish semver tags as releases. + tags: [ 'v*.*.*' ] + pull_request: + branches: [ "main" ] + +env: + REGISTRY: ${{ forgejo.server_url }} + IMAGE_NAME: ${{ forgejo.repository }} + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: https://code.forgejo.org/actions/checkout@v4 + + # Set up BuildKit Docker container builder to be able to build + # multi-platform images and export cache + # https://github.com/docker/setup-buildx-action + - name: Set up Docker Buildx + uses: https://github.com/docker/setup-buildx-action@v3 + + # Login against the Forgejo container registry except on PR + # https://github.com/docker/login-action + - name: Log into registry ${{ env.REGISTRY }} + if: forgejo.event_name != 'pull_request' + uses: https://github.com/docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ forgejo.actor }} + password: ${{ secrets.FORGEJO_TOKEN }} + + # Extract metadata (tags, labels) for Docker + # https://github.com/docker/metadata-action + - name: Extract Docker metadata + id: meta + uses: https://github.com/docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + # Build and push Docker image with Buildx (don't push on PR) + # https://github.com/docker/build-push-action + - name: Build and push Docker image + id: build-and-push + uses: https://github.com/docker/build-push-action@v5 + with: + context: . + push: ${{ forgejo.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + diff --git a/.forgejo/workflows/shellcheck.yml b/.forgejo/workflows/shellcheck.yml new file mode 100644 index 0000000..196a617 --- /dev/null +++ b/.forgejo/workflows/shellcheck.yml @@ -0,0 +1,19 @@ +name: ShellCheck + +on: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + shellcheck: + runs-on: ubuntu-latest + steps: + - uses: https://code.forgejo.org/actions/checkout@v4 + + - name: Install ShellCheck + run: apt-get update && apt-get install -y shellcheck + + - name: Run ShellCheck + run: find ./src -name '*.sh' -exec shellcheck {} + From bfea98db6153f5412d5966225bc8e0804d259a32 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 22 Mar 2026 17:40:57 +0000 Subject: [PATCH 4/6] Don't start unhealthy --- src/healthcheck.sh | 15 +++++++++++++-- src/schedule.sh | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/healthcheck.sh b/src/healthcheck.sh index 255ba29..c4cb69d 100755 --- a/src/healthcheck.sh +++ b/src/healthcheck.sh @@ -2,15 +2,26 @@ set -e +MAX_BACKUP_AGE_SECONDS="${MAX_BACKUP_AGE_SECONDS:-86400}" + if [ -f /health/backup_completion_time.log ]; then current_time=$(date +%s) backup_time=$(date --file /health/backup_completion_time.log +%s) age_in_seconds=$((current_time - backup_time)) - - if [ ${age_in_seconds} -lt "${MAX_BACKUP_AGE_SECONDS}" ]; then + + if [ "${age_in_seconds}" -lt "${MAX_BACKUP_AGE_SECONDS}" ]; then echo "Backup completed within the last ${MAX_BACKUP_AGE_SECONDS} seconds. Healthcheck passed." exit 0 fi +elif [ -f /health/container_start_time.log ]; then + current_time=$(date +%s) + start_time=$(date --file /health/container_start_time.log +%s) + age_in_seconds=$((current_time - start_time)) + + if [ "${age_in_seconds}" -lt "${MAX_BACKUP_AGE_SECONDS}" ]; then + echo "No backup completed yet, but container started less than ${MAX_BACKUP_AGE_SECONDS} seconds ago. Healthcheck passed." + exit 0 + fi fi echo "Backup not completed within the last ${MAX_BACKUP_AGE_SECONDS} seconds. Healthcheck failed." diff --git a/src/schedule.sh b/src/schedule.sh index 4956b0a..1ca95b1 100755 --- a/src/schedule.sh +++ b/src/schedule.sh @@ -11,6 +11,7 @@ get_log_file_name() { } echo "Starting schedule script at $(date)" | log_message +date > /health/container_start_time.log while true; do exec /src/backup-wrapper.sh 2>&1 | log_message From fd581ef877589d39041dfecdbed7044acba3e84e Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 22 Mar 2026 17:41:30 +0000 Subject: [PATCH 5/6] Always clean up --- src/backup.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/backup.sh b/src/backup.sh index f2b053b..11a6611 100755 --- a/src/backup.sh +++ b/src/backup.sh @@ -17,18 +17,29 @@ if ! borg info; then borg init --encryption=repokey fi -# The above command will fail if the repo hasn't been already initialized, +# The above command will fail if the repo hasn't been already initialized, # so we can ignore the return status. However, if any of the commands below fail, # we want to stop the script immediately. set -e +cleanup() { + if [ -n "${GIT_EXCLUDE_FILE:-}" ] && [ -f "$GIT_EXCLUDE_FILE" ]; then + rm -f "$GIT_EXCLUDE_FILE" + fi + if [ -d "/snapshot/btrfs-root" ]; then + cd / + btrfs subvolume delete /snapshot/btrfs-root || true + fi +} +trap cleanup EXIT + if [ -d "/snapshot/btrfs-root" ]; then btrfs subvolume delete /snapshot/btrfs-root fi btrfs subvolume snapshot /btrfs-root /snapshot -cd "/snapshot/btrfs-root$BACKUP_RELATIVE_PATH" +cd "/snapshot/btrfs-root${BACKUP_RELATIVE_PATH:-}" # Generate exclusions for git-untracked files if enabled EXCLUDE_ARGS=(--exclude-from /exclude.conf) @@ -37,12 +48,12 @@ if [ "${IGNORE_GIT_UNTRACKED:-false}" = "true" ]; then GIT_EXCLUDE_FILE=$(mktemp) # Find all git repositories and list their untracked files - find . -name .git -type d 2>/dev/null | while read -r gitdir; do + find . -name .git -type d | while read -r gitdir; do repo_dir=$(dirname "$gitdir") ( cd "$repo_dir" # Get untracked files (respecting .gitignore) - git ls-files --others --exclude-standard 2>/dev/null | while read -r file; do + git ls-files --others --exclude-standard | while read -r file; do # Output path relative to backup root echo "${repo_dir#./}/$file" done @@ -62,11 +73,6 @@ borg create --stats \ --compression=zstd,12 \ "${EXCLUDE_ARGS[@]}" ::"{hostname}-{now:%Y-%m-%dT%H:%M:%S}" . -# Clean up temporary exclude file -if [ -n "$GIT_EXCLUDE_FILE" ] && [ -f "$GIT_EXCLUDE_FILE" ]; then - rm -f "$GIT_EXCLUDE_FILE" -fi - cd - borg prune --list --stats \ @@ -76,6 +82,3 @@ borg prune --list --stats \ --keep-yearly="$KEEP_YEARLY" borg compact --threshold=5 --cleanup-commits --verbose --progress - -btrfs subvolume delete /snapshot/btrfs-root - From 31bc548fdd250cb16d40df9b535f78d696618e0c Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 22 Mar 2026 17:41:39 +0000 Subject: [PATCH 6/6] Lint --- src/backup-wrapper.sh | 2 +- src/schedule.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backup-wrapper.sh b/src/backup-wrapper.sh index f4bc61b..feb0219 100755 --- a/src/backup-wrapper.sh +++ b/src/backup-wrapper.sh @@ -20,7 +20,7 @@ configure_environment() { for var in BORG_PASSPHRASE BORG_REPO; do local indexed_var_name="${var}_${index}" if [[ -n "${!indexed_var_name}" ]]; then - export $var="${!indexed_var_name}" + export "$var"="${!indexed_var_name}" else all_vars_set=false break diff --git a/src/schedule.sh b/src/schedule.sh index 1ca95b1..9aaf1f3 100755 --- a/src/schedule.sh +++ b/src/schedule.sh @@ -14,7 +14,7 @@ echo "Starting schedule script at $(date)" | log_message date > /health/container_start_time.log while true; do - exec /src/backup-wrapper.sh 2>&1 | log_message + /src/backup-wrapper.sh 2>&1 | log_message echo "Sleeping for $SLEEP_TIME" | log_message # Using a simple sleep loop to schedule backups instead of cron to avoid concurrency issues