akanealw/Charon
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(workflow): update base image in docker-build.yml from debian:bookworm-slim to debian:trixie-slim to resolve build inconsistency

Browse Source
This commit is contained in:
GitHub Actions
2026-01-25 05:08:14 +00:00
parent 6f670dd097
commit 4fcca5ed7d
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/plans/merge-resolution-plan.md
+25
View File
@@ -7,6 +7,31 @@
---
## 🔴 Workflow Failure Analysis (Added 2026-01-25)
### Issue Identified: docker-build.yml Failure
**Workflow Run**: https://github.com/Wikid82/Charon/actions/runs/21326638353
**Root Cause**: Base image mismatch after Debian Trixie migration (PR #550)
| Component | Before Fix | After Fix |
|-----------|-----------|-----------|
| Workflow `docker-build.yml` | `debian:bookworm-slim` | `debian:trixie-slim` |
| Dockerfile `CADDY_IMAGE` | `debian:trixie-slim` | `debian:trixie-slim` ✓ |
**Problem**: The workflow step "Resolve Debian base image digest" was still pulling `debian:bookworm-slim` while the Dockerfile was updated to use `debian:trixie-slim`. This caused inconsistency in the build.
**Fix Applied**: Updated [.github/workflows/docker-build.yml](.github/workflows/docker-build.yml#L54-L57):
```yaml
- name: Resolve Debian base image digest
run: |
docker pull debian:trixie-slim
DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' debian:trixie-slim)
```
---
## Summary
This plan addresses merge conflicts in the `feature/beta-release` branch that need resolution against `main`. After analyzing all conflicting files, here is the recommended resolution strategy.