diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml deleted file mode 100644 index 4d2b812..0000000 --- a/.forgejo/workflows/docker-publish.yml +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 196a617..0000000 --- a/.forgejo/workflows/shellcheck.yml +++ /dev/null @@ -1,19 +0,0 @@ -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 {} + diff --git a/README.md b/README.md index d86a23a..87dfd8f 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. -- **Healthcheck**: The healthcheck is based on the time of the last successful backup. +- **Healtcheck**: The healthcheck is based on the time of the last successful backup. ### Multi-target backups diff --git a/config/ssh_config b/config/ssh_config index a8ed7dd..7017c33 100644 --- a/config/ssh_config +++ b/config/ssh_config @@ -1,4 +1,4 @@ Host * - StrictHostKeyChecking accept-new + StrictHostKeyChecking no ServerAliveInterval 30 ServerAliveCountMax 3 diff --git a/docker-compose.yml b/docker-compose.yml index 7c56ea5..5f4b028 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ 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 diff --git a/src/backup-wrapper.sh b/src/backup-wrapper.sh index feb0219..f4bc61b 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/backup.sh b/src/backup.sh index 11a6611..f2b053b 100755 --- a/src/backup.sh +++ b/src/backup.sh @@ -17,29 +17,18 @@ 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) @@ -48,12 +37,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 | while read -r gitdir; do + find . -name .git -type d 2>/dev/null | while read -r gitdir; do repo_dir=$(dirname "$gitdir") ( cd "$repo_dir" # Get untracked files (respecting .gitignore) - git ls-files --others --exclude-standard | while read -r file; do + git ls-files --others --exclude-standard 2>/dev/null | while read -r file; do # Output path relative to backup root echo "${repo_dir#./}/$file" done @@ -73,6 +62,11 @@ 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 \ @@ -82,3 +76,6 @@ borg prune --list --stats \ --keep-yearly="$KEEP_YEARLY" borg compact --threshold=5 --cleanup-commits --verbose --progress + +btrfs subvolume delete /snapshot/btrfs-root + diff --git a/src/healthcheck.sh b/src/healthcheck.sh index c4cb69d..255ba29 100755 --- a/src/healthcheck.sh +++ b/src/healthcheck.sh @@ -2,26 +2,15 @@ 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 9aaf1f3..4956b0a 100755 --- a/src/schedule.sh +++ b/src/schedule.sh @@ -11,10 +11,9 @@ get_log_file_name() { } echo "Starting schedule script at $(date)" | log_message -date > /health/container_start_time.log while true; do - /src/backup-wrapper.sh 2>&1 | log_message + exec /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