Merge pull request kubernetes#1839 from sozercan/fix-arch

Fix non-amd64 arch config for debian images
wespanther · Jan 13, 2021 · 1fd673e · 1fd673e
2 parents ce6512e + 8d4e44f
commit 1fd673e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/images/build/debian-base/Makefile b/images/build/debian-base/Makefile
@@ -92,10 +92,15 @@ else
 endif
 	mv $(TEMP_DIR)/$(CONFIG)/Dockerfile.build.tmp $(TEMP_DIR)/$(CONFIG)/Dockerfile.build
 
-	docker build --pull -t $(BUILD_IMAGE) -f $(TEMP_DIR)/$(CONFIG)/Dockerfile.build $(TEMP_DIR)/$(CONFIG)
+	docker buildx build \
+		--pull \
+		--platform $(ARCH) \
+		-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 build \
+	docker buildx build \
+		--platform $(ARCH) \
 		-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,7 +74,10 @@ 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 build --pull -t $(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
+	docker buildx build \
+		--pull \
+		--platform $(ARCH) \
+		-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,8 +46,9 @@ ifneq ($(ARCH),amd64)
 	$(SUDO) ../../../third_party/multiarch/qemu-user-static/register/register.sh --reset
 endif
 
-	docker build \
+	docker buildx build \
 		--pull \
+		--platform $(ARCH) \
 		-t $(IMAGE)-$(ARCH):$(IMAGE_VERSION) \
 		-t $(IMAGE)-$(ARCH):$(TAG)-$(CONFIG) \
 		-t $(IMAGE)-$(ARCH):latest-$(CONFIG) \