Skip to content

Commit 7616d68

Browse files
authored
Merge pull request #174 from andyzhangx/remove-buildkit-workaround
test: remove buildkit workaround
2 parents 967facb + ce48081 commit 7616d68

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Makefile

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

139139
.PHONY: container-all
140140
container-all: smb-windows
141-
# enable qemu for arm64 build
142-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
143141
docker buildx rm container-builder || true
144142
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
143+
# enable qemu for arm64 build
144+
docker run --rm --privileged tonistiigi/binfmt --install all
150145
for arch in $(ALL_ARCH.linux); do \
151146
ARCH=$${arch} $(MAKE) smb; \
152147
ARCH=$${arch} $(MAKE) container-linux; \

0 commit comments

Comments
 (0)