Merge pull request #715 from alicefr/other-arch

Set GOARCH to amd64 for darwin/windows building stage
moby · Nov 8, 2018 · e00566d · e00566d
2 parents c3a857e + a008ce3
commit e00566d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/hack/dockerfiles/test.Dockerfile b/hack/dockerfiles/test.Dockerfile
@@ -28,6 +28,7 @@ RUN go build -ldflags "$(cat .tmp/ldflags) -d" -o /usr/bin/buildctl ./cmd/buildc
 FROM buildkit-base AS buildctl-darwin
 ENV CGO_ENABLED=0
 ENV GOOS=darwin
+ENV GOARCH=amd64
 RUN go build -ldflags "$(cat .tmp/ldflags)" -o /out/buildctl-darwin ./cmd/buildctl
 # reset GOOS for legacy builder
 ENV GOOS=linux
@@ -110,6 +111,7 @@ COPY --from=rootlesskit /rootlesskit /usr/bin/
 
 FROM buildkit-base AS cross-windows
 ENV GOOS=windows
+ENV GOARCH=amd64
 
 FROM cross-windows AS buildctl.exe
 RUN go build -ldflags "$(cat .tmp/ldflags)" -o /out/buildctl.exe ./cmd/buildctl