0xWheatyz/handler
1
0
Fork 0
mirror of https://github.com/0xWheatyz/handler.git synced 2026-08-30 07:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(docker): pin mise apt arch via dpkg, not TARGETARCH default

Browse Source 
The arm64 control image build failed installing mise: it pulled the amd64
.deb (dpkg "architecture (amd64) does not match system (arm64)"). Cause: the
`ARG TARGETARCH=amd64` default overrode the per-platform value buildx injects,
so the arm64 stage wrote an amd64 apt source. Derive the arch from
`dpkg --print-architecture` (the image's own arch) instead — correct on both
platforms and independent of buildx arg wiring.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YKVyBmKvWDVgrFC9WER2f2
This commit is contained in:
Claude
2026-07-13 18:00:58 +00:00
parent e96bf25165
commit 1a3e832ba9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile.control
+3 -4
View File
@@ -45,9 +45,8 @@ FROM python:3.11-slim
# repo; forge from the build stage above. Installed under /usr/{bin,local/bin} — outside the # repo; forge from the build stage above. Installed under /usr/{bin,local/bin} — outside the
# /var/lib/handler VOLUME — so the volume mount never masks them at runtime. The image is # /var/lib/handler VOLUME — so the volume mount never masks them at runtime. The image is
# built for amd64 and arm64: NodeSource + forge detect the arch, and the mise apt source is # built for amd64 and arm64: NodeSource + forge detect the arch, and the mise apt source is
# pinned to $TARGETARCH (buildx sets it; the Debian arch names match) so the arm64 build # pinned to `dpkg --print-architecture` (the image's own arch) so the arm64 build pulls the
# doesn't pull an amd64-only list. # arm64 package, not an amd64 one.
ARG TARGETARCH=amd64
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
git tmux openssh-client curl ca-certificates gnupg \ git tmux openssh-client curl ca-certificates gnupg \
@@ -58,7 +57,7 @@ RUN apt-get update \
&& npm cache clean --force \ && npm cache clean --force \
&& curl -fsSL https://mise.jdx.dev/gpg-key.pub \ && curl -fsSL https://mise.jdx.dev/gpg-key.pub \
| gpg --dearmor -o /etc/apt/keyrings/mise-archive-keyring.gpg \ | gpg --dearmor -o /etc/apt/keyrings/mise-archive-keyring.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=${TARGETARCH}] https://mise.jdx.dev/deb stable main" \ && echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=$(dpkg --print-architecture)] https://mise.jdx.dev/deb stable main" \
> /etc/apt/sources.list.d/mise.list \ > /etc/apt/sources.list.d/mise.list \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends mise \ && apt-get install -y --no-install-recommends mise \