github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25684 from kubernetes/revert-24852-fix-hyperkube-makefile

Browse Source 
Automatic merge from submit-queue

Revert "OS X: Fix hyperkube build by adding empty string to sed invocation"

Reverts kubernetes/kubernetes#24852

This breaks the Linux build.

cc @johscheuer @zmerlynn
This commit is contained in:
k8s-merge-robot 2016-05-16 15:17:31 -07:00
commit a6812d18a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/hyperkube/Makefile
View File

@ -57,13 +57,13 @@ endif
ifeq ($(ARCH),amd64)
# When building "normally" for amd64, remove the whole line, it has no part in the amd64 image
cd ${TEMP_DIR} && sed -i "" "/CROSS_BUILD_/d" Dockerfile
cd ${TEMP_DIR} && sed -i "/CROSS_BUILD_/d" Dockerfile
else
# When cross-building, only the placeholder "CROSS_BUILD_" should be removed
# Register /usr/bin/qemu-ARCH-static as the handler for ARM binaries in the kernel
docker run --rm --privileged multiarch/qemu-user-static:register --reset
curl -sSL --retry 5 https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-${QEMUARCH}-static.tar.xz | tar -xJ -C ${TEMP_DIR}
cd ${TEMP_DIR} && sed -i "" "s/CROSS_BUILD_//g" Dockerfile
cd ${TEMP_DIR} && sed -i "s/CROSS_BUILD_//g" Dockerfile
endif
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}