Merge pull request #1849 from justaugustus/revert-base-buildx

Revert "Merge pull request #1839 from sozercan/fix-arch"
kubernetes · Jan 15, 2021 · ce5ecf2 · ce5ecf2
2 parents 1d1173e + c252c58
commit ce5ecf2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/images/build/debian-base/Makefile b/images/build/debian-base/Makefile
@@ -92,15 +92,10 @@ else
 endif
 	mv $(TEMP_DIR)/$(CONFIG)/Dockerfile.build.tmp $(TEMP_DIR)/$(CONFIG)/Dockerfile.build
 
-	docker buildx build \
-		--pull \
-		--platform $(ARCH) \
-		-t $(BUILD_IMAGE) \
-		-f $(TEMP_DIR)/$(CONFIG)/Dockerfile.build $(TEMP_DIR)/$(CONFIG)
+	docker build --pull -t $(BUILD_IMAGE) -f $(TEMP_DIR)/$(CONFIG)/Dockerfile.build $(TEMP_DIR)/$(CONFIG)
 	docker create --name $(BUILD_IMAGE) $(BUILD_IMAGE)
 	docker export $(BUILD_IMAGE) > $(TEMP_DIR)/$(CONFIG)/$(TAR_FILE)
-	docker buildx build \
-		--platform $(ARCH) \
+	docker build \
 		-t $(IMAGE)-$(ARCH):$(IMAGE_VERSION) \
 		-t $(IMAGE)-$(ARCH):$(TAG)-$(CONFIG) \
 		-t $(IMAGE)-$(ARCH):latest-$(CONFIG) \

diff --git a/images/build/debian-hyperkube-base/Makefile b/images/build/debian-hyperkube-base/Makefile
@@ -74,10 +74,7 @@ ifneq ($(ARCH),amd64)
 	# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
 	$(SUDO) ../../../third_party/multiarch/qemu-user-static/register/register.sh --reset
 endif
-	docker buildx build \
-		--pull \
-		--platform $(ARCH) \
-		-t $(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
+	docker build --pull -t $(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
 	rm -rf $(TEMP_DIR)
 
 push: build

diff --git a/images/build/debian-iptables/Makefile b/images/build/debian-iptables/Makefile
@@ -46,9 +46,8 @@ ifneq ($(ARCH),amd64)
 	$(SUDO) ../../../third_party/multiarch/qemu-user-static/register/register.sh --reset
 endif
 
-	docker buildx build \
+	docker build \
 		--pull \
-		--platform $(ARCH) \
 		-t $(IMAGE)-$(ARCH):$(IMAGE_VERSION) \
 		-t $(IMAGE)-$(ARCH):$(TAG)-$(CONFIG) \
 		-t $(IMAGE)-$(ARCH):latest-$(CONFIG) \