Skip to content

Fix CI: /status probe over 127.0.0.1, slash-safe branch tags, tidy status nesting #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Robbie1977 merged 2 commits into from
Aug 26, 2026
Merged

Fix CI: /status probe over 127.0.0.1, slash-safe branch tags, tidy status nesting #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de953e5
Fix CI: probe /status over 127.0.0.1 and sanitise branch image tags
Robbie1977 Aug 26, 2026
f901616
Fix /status nesting indent and check restore state in CI
Robbie1977 Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
else
TAG=${GITHUB_REF#refs/heads/}
fi
# A branch like feature/x is not a valid image tag; use feature-x.
TAG=${TAG//\//-}
echo "tag=$TAG" >> $GITHUB_OUTPUT

- name: Test NGINX configuration
Expand Down Expand Up @@ -83,7 +85,8 @@ jobs:
fi
docker logs test-container | grep -q 'Scheduled cache backup: crontab' || { echo "backup not scheduled"; docker logs test-container; exit 1; }
docker exec test-container test -f /var/cache/nginx/owlery/0/00/00000000000000000000000000000001 || { echo "archive entry not restored"; docker logs test-container; exit 1; }
docker exec test-container wget -q -O - http://localhost/status | grep -q '"restore": {' || { echo "/status lacks archive.restore"; docker exec test-container wget -q -O - http://localhost/status; exit 1; }
# 127.0.0.1, not localhost: BusyBox wget resolves localhost to ::1 first and nginx listens on IPv4 only.
docker exec test-container wget -q -O - http://127.0.0.1/status | grep -q '"restore": {' && docker exec test-container wget -q -O - http://127.0.0.1/status | grep -q '"state": "done"' || { echo "/status lacks archive.restore"; docker exec test-container wget -q -O - http://127.0.0.1/status; exit 1; }
docker exec test-container cache-backup.sh --full | grep -q 'backup: done' || { echo "manual backup failed"; exit 1; }
docker stop test-container || true
docker rm test-container
Expand Down
3 changes: 2 additions & 1 deletion health-monitor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ CACHE_BACKUP_STATE=${CACHE_BACKUP_STATE:-$STATUS_DIR/cache-backup.json}
# when that job has not run in this container yet.
json_state_or_null() {
if [ -s "$1" ]; then
sed 's/^/ /' "$1"
# Indent every line but the first, which follows the key on its own line.
sed '1!s/^/ /' "$1"
else
printf 'null'
fi
Expand Down
Loading