Skip to content

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

Merge pull request #33484 from Yancey1989/bug_addons_sed

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 ..```
parents c0bd6e8e e3c497d4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/addons/addon-manager/Makefile
View file @ 6ba83ec0
...@@ -51,13 +51,13 @@ build: ...@@ -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)
......
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