Skip to content

K
k3s
Unverified Commit b9631a88 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #73231 from liggitt/add-on-arch-build

Enable multi-arch build for add-on manager
parents 9f4a495a af663769
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
cluster/addons/addon-manager/Makefile
View file @ b9631a88
...@@ -20,6 +20,8 @@ KUBECTL_VERSION?=v1.13.2 ...@@ -20,6 +20,8 @@ KUBECTL_VERSION?=v1.13.2
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0
SUDO=$(if $(filter 0,$(shell id -u)),,sudo)
.PHONY: build push .PHONY: build push
all: build all: build
...@@ -29,6 +31,12 @@ build: ...@@ -29,6 +31,12 @@ build:
curl -sSL --retry 5 https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl curl -sSL --retry 5 https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl
chmod +x $(TEMP_DIR)/kubectl chmod +x $(TEMP_DIR)/kubectl
cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
ifneq ($(ARCH),amd64)
# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
$(SUDO) ../../../third_party/multiarch/qemu-user-static/register/register.sh --reset
endif
docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
push: build push: build
......
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