github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33484 from Yancey1989/bug_addons_sed

Browse Source 
Automatic merge from submit-queue

fix sed command run failed on mac os

bash command ```sed -i ... ``` run failed on mac os, it should be ```sed -i.back ..```
This commit is contained in:
Kubernetes Submit Queue
2016-10-14 23:30:07 -07:00
committed by GitHub
parent c0bd6e8ea5 e3c497d461
commit 6ba83ec0a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/addon-manager/Makefile
View File

@@ -51,13 +51,13 @@ build:
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# When building "normally" for amd64, remove the whole line, it has no part in the amd64 image # 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.back "/CROSS_BUILD_/d" Dockerfile
else else
# When cross-building, only the placeholder "CROSS_BUILD_" should be removed # When cross-building, only the placeholder "CROSS_BUILD_" should be removed
# Register /usr/bin/qemu-ARCH-static as the handler for other-arch binaries in the kernel # Register /usr/bin/qemu-ARCH-static as the handler for other-arch binaries in the kernel
docker run --rm --privileged multiarch/qemu-user-static:register --reset 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) 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.back "s/CROSS_BUILD_//g" Dockerfile
endif endif
docker build -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) docker build -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)