Flux's ImageUpdateAutomation commits directly to Forgejo (the
GitRepository it actually watches), so Forgejo routinely has commits
GitHub never sees. The previous rebase-then-push assumed Forgejo was
always a fast-forward of GitHub; once that stopped being true the
rebase failed on every run and silently stalled all deploys for three
days (fixed manually in the prior commit). Switch to a merge that
favors GitHub's content on conflict (-X ours) and only pushes the
merge commit to Forgejo, leaving GitHub's branch untouched.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
- Fix PostgreSQL endpoints (now auto-creating correctly)
- Fix Forgejo DB connection
- Update retention to keep 10 SHA tags (was 2, too aggressive)
- Update all deployments to use available tags
- Add missing base images to registry (alpine, node, rust, python)
- Protect base images from retention deletion
