Fix failing multi-arch runs; sync reliability fixes from upstream#2
Merged
IllusoryKitsune merged 1 commit intomasterfrom Apr 15, 2026
Merged
Conversation
build.yaml: drop tags from the per-platform push step (they conflict with push-by-digest=true,push=true and cause all master-branch matrix jobs to fail on GHCR). The merge job already creates the :build and :<version>-build tags via buildx imagetools create. Also drop linux/arm/v7 from the matrix: proton-bridge's CGO deps (libfido2/cbor) don't cross-compile cleanly on 32-bit ARM and upstream doesn't target it. build/Dockerfile: add runtime libfido2-1 and libcbor0.10 (dynamically linked by the built binaries, previously missing), add pkg-config to the build stage (CGO needs it to find .pc files), add procps for the healthcheck, and add a HEALTHCHECK so orchestrators detect a crashed bridge. Pulled from shenxn#149, shenxn#134, shenxn#128. build/entrypoint.sh, deb/entrypoint.sh: remove stale /root/.gnupg/ S.gpg-agent* sockets on startup (fixes bridge failing to start after a container restart) and harden socat with fork,reuseaddr and nodelay for more reliable port forwarding. Pulled from shenxn#134. README.md: drop arm/v7 from the supported platforms list.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Post-merge of #1, the
build from sourceworkflow failed onmaster(run #9) for every architecture:amd64,arm64/v8,riscv64—failed to push ghcr.io/illusorykitsune/protonmail-bridge-docker:build by digestarm/v7—make build-nogui vault-editorcompile failureThis PR unbreaks the master-branch build and brings in the non-controversial upstream reliability fixes that were missing.
Root causes
tags:alongsideoutputs: ...push-by-digest=true,...,push=true. The canonical multi-arch recipe has matrix jobs push only by digest — the merge job derives tags viadocker/metadata-actionand publishes them withbuildx imagetools create. Four parallel jobs racing on the:buildtag was being rejected by GHCR.Changes
.github/workflows/build.yamllinux/arm/v7from the matrix and from thePLATFORMSenv.tags:block from the per-platform "Build and push by digest" step (merge job still produces:buildand:<version>-build).build/DockerfileBuild stage: add
pkg-config(CGO needs it to locate libfido2/cbor.pcfiles; not part ofbuild-essential).Runtime stage: add
libfido2-1,libcbor0.10,procps. The bridge binaries are dynamically linked against libfido2/cbor — without these in the runtime image the built binary won't launch.procpsis needed forpgrepbelow.Add
HEALTHCHECKso Docker/K8s can detect a crashed bridge.Pulled from upstream shenxn/protonmail-bridge-docker#149, #134, #128.
build/entrypoint.sh,deb/entrypoint.shClean up stale
/root/.gnupg/S.gpg-agent*sockets on startup (bridge refuses to start after unclean shutdowns otherwise).Harden socat with
fork,reuseaddr+nodelayfor more reliable SMTP/IMAP forwarding.Pulled from upstream shenxn/protonmail-bridge-docker#134.
README.mdarm/v7from the supported-platform list.Upstream items intentionally not included
TCP-LISTEN; switching toTCP6-LISTENbreaks withnet.ipv6.bindv6only=1.Test plan
testjob (single-arch amd64 build + Trivy scan) anddebjob — both should stay green. The Dockerfile/entrypoint changes are exercised by those builds.build from sourcerun onmastershould succeed on all three remaining arches (amd64,arm64/v8,riscv64) and themergejob should publishghcr.io/illusorykitsune/protonmail-bridge-docker:buildand:v3.23.1-buildmanifest lists.docker run --rm ghcr.io/illusorykitsune/protonmail-bridge-docker:build /protonmail/proton-bridge --versionshould print a version string (proves libfido2-1/libcbor0.10 are present at runtime).docker inspect --format '{{json .Config.Healthcheck}}' <image>shows the new healthcheck.https://claude.ai/code/session_01GReisMWDRKaVU49RuzvnrL