Skip to content

Commit ca564fb

Browse files
authored
Merge pull request #170 from andyzhangx/fix-buildkit
fix: windows image build error
2 parents 0f095d9 + a9d700e commit ca564fb

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,15 @@ container-windows:
138138

139139
.PHONY: container-all
140140
container-all: smb-windows
141-
docker buildx rm container-builder || true
142-
docker buildx create --use --name=container-builder
143141
# enable qemu for arm64 build
144142
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
143+
docker buildx rm container-builder || true
144+
docker buildx create --use --name=container-builder
145+
# only moby/buildkit:foreign-mediatype works on building Windows image now
146+
# https://github.com/moby/buildkit/pull/1879
147+
docker run --rm --privileged --name buildx_buildkit_container-builder0 -d andyzhangx/buildkit:v0.8.0-foreign-mediatype
148+
# sleep 5s waiting for container-builder running complete
149+
sleep 5
145150
for arch in $(ALL_ARCH.linux); do \
146151
ARCH=$${arch} $(MAKE) smb; \
147152
ARCH=$${arch} $(MAKE) container-linux; \

0 commit comments

Comments
 (0)