Skip to content

K
k3s
Commit 470eb922 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51141 from ixdy/docker-qemu-register

Automatic merge from submit-queue (batch tested with PRs 50489, 51070, 51011, 51022, 51141) Run multiarch/qemu-user-static:register before building cross-arch images **What this PR does / why we need it**: #48365 inadvertently broke building non-x86 hyperkube images for developers who'd not built non-x86 images before and thus hadn't yet run `multiarch/qemu-user-static:register`. This PR restores that step. **Release note**: ```release-note NONE ``` /assign @david-mcmahon @mbohlool @luxas
parents c23e5b60 6458f346
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
build/debian-hyperkube-base/Makefile
View file @ 470eb922
......@@ -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)
......
cluster/images/hyperkube/Makefile
View file @ 470eb922
......@@ -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}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment