From 665f67eb21bb987062bf74165e7df4802e54c82d Mon Sep 17 00:00:00 2001
From: Guillaume Lours <705411+glours@users.noreply.github.com>
Date: Tue, 7 Jul 2026 21:40:32 +0200
Subject: [PATCH] fix: cross-compile binaries for the requested target platform

All published platform variants (386, arm/v6, arm/v7, arm64, ppc64le)
contained the same amd64 binary: the builder stage runs on
BUILDPLATFORM but go build never set GOOS/GOARCH, so images only
worked where emulation (e.g. Rosetta) was available.

Build with explicit GOOS/GOARCH/GOARM from BuildKit platform args and
add an xx-verify --static guard so any future cross-compile regression
fails the build instead of publishing wrong-arch images. Also split
go.mod/go.sum into their own layer for module cache reuse and add a
.dockerignore to keep the build context minimal.

Signed-off-by: Guillaume Lours <glours@users.noreply.github.com>
---
 .dockerignore |  8 ++++++++
 Dockerfile    | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..699ef08
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+.github
+.idea
+.claude
+CLAUDE.md
+README.md
+LICENSE
+Dockerfile
+docker-bake.hcl
diff --git a/Dockerfile b/Dockerfile
index dbeac8e..7a5d2cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,16 @@
+FROM --platform=${BUILDPLATFORM} tonistiigi/xx:1.9.0 AS xx
+
 FROM --platform=${BUILDPLATFORM} golang:1.24.5 AS builder
+COPY --from=xx / /
+RUN xx-verify --setup
 WORKDIR $GOPATH/src/github.com/docker/compose-bridge-transformer
+COPY go.mod go.sum ./
+RUN go mod download
 COPY . .
-RUN go build -o /go/bin/transform
+ARG TARGETOS TARGETARCH TARGETVARIANT
+RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH GOARM=${TARGETVARIANT#v} \
+    go build -o /go/bin/transform && \
+    xx-verify --static /go/bin/transform
 
 FROM scratch AS transformer
 LABEL com.docker.compose.bridge=transformation