refactor(docker): Consolidate Dockerfile.aarch64 into Dockerfile#540
Merged
luisangelsm merged 1 commit intoMay 20, 2026
Merged
Conversation
luisangelsm
force-pushed
the
feat/docker-merge-dockerfiles
branch
from
1cb9ab6 to
3bca91b
Compare
Member
|
CI seems to pass. |
The amd64 and arm64 Dockerfiles became byte-identical after YACReader#505 landed the resolute base, kimageformats runtime, and the split sevenzip-builder stage on arm64. Drop the duplicate and point the docker-arm64 CI job at the shared Dockerfile; the linuxserver 'resolute' tag is a multi-arch manifest, so the same Dockerfile builds natively on either runner. Pin --platform linux/arm64 on the arm64 job to match the existing --platform linux/amd64 on the amd64 job. Stacked on YACReader#505 — must merge after YACReader#505. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
luisangelsm
force-pushed
the
feat/docker-merge-dockerfiles
branch
from
3bca91b to
2713dbe
Compare
Member
|
@nickv2002 Thanks! |
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
2 participants
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
docker/Dockerfileanddocker/Dockerfile.aarch64are byte-identical — same base (linuxserver/baseimage-ubuntu:resolute, a multi-arch manifest), same package lists, same multi-stage layout.docker/Dockerfile.aarch64and points the existingdocker-arm64CI job at the sharedDockerfile.--platform linux/arm64on the arm64 job to match the explicit--platform linux/amd64already used by the amd64 job. Both jobs still run on their native runners (ubuntu-latestandubuntu-24.04-arm) and the manifest-combine step downstream is untouched, so multi-architecture publishing keeps working.Dependency
Stacked on #505. Must merge after #505 — the byte-identical state only exists once #505 lands. While #505 is open, this PR's diff will include the #505 commits; GitHub will narrow it down automatically after #505 merges.
Test plan
Dockerfileproduces a working image withkimg_avif.so+kimg_jxl.sopresent;avif.cbzandjxl.cbzpages render end-to-end through the HTTP API.docker-amd64anddocker-arm64jobs succeed building from the singleDockerfile.docker buildx imagetools createmanifest-combine step still produces a working multi-arch tag.🤖 Generated with Claude Code