Run multiarch/qemu-user-static:register before building cross-arch im…

…ages
kubernetes · Aug 22, 2017 · 6458f34 · 6458f34
1 parent e225666
commit 6458f34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile
@@ -51,6 +51,8 @@ endif
 	mkdir -p ${TEMP_DIR}/cni-bin
 	tar -xz -C ${TEMP_DIR}/cni-bin -f "cni-tars/${CNI_TARBALL}"
 
+	# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
+	docker run --rm --privileged multiarch/qemu-user-static:register --reset
 	docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
 	rm -rf $(TEMP_DIR)
 

diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
@@ -38,6 +38,8 @@ endif
 
 	cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
 
+	# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
+	docker run --rm --privileged multiarch/qemu-user-static:register --reset
 	docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
 	rm -rf "${TEMP_DIR}"