From e95caf947141bf9b2a4b92aa19c8ad9d5ce677ae Mon Sep 17 00:00:00 2001 From: JimmyYang20 Date: Tue, 19 Oct 2021 20:14:47 +0800 Subject: [PATCH] Fix bug: control plane supports arm64 Signed-off-by: JimmyYang20 --- Makefile | 3 ++- hack/lib/buildx.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c91df112..3fb679ca 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ gmimage lcimage kbimage: docker build --build-arg GO_LDFLAGS=${GO_LDFLAGS} -t ${IMAGE_REPO}/sedna-${@:image=}:${IMAGE_TAG} -f build/${@:image=}/Dockerfile . -.PHONY: push push-examples push-all push-multi-platforms +.PHONY: push push-examples push-all push-multi-platform-images push-all: push-multi-platform-images push-examples # push target pushes sedna-built images @@ -154,6 +154,7 @@ push: images push-examples: bash examples/push_image.sh + # push multi-platform images push-multi-platform-images: bash hack/make-rules/push.sh diff --git a/hack/lib/buildx.sh b/hack/lib/buildx.sh index 89deb1b3..f179ba3c 100644 --- a/hack/lib/buildx.sh +++ b/hack/lib/buildx.sh @@ -38,7 +38,7 @@ sedna::buildx::prepare_env() { sedna::buildx:generate-dockerfile() { dockerfile=${1} - sed "/AS builder/s/FROM/FROM --platform=\$BUILDPLATFORM/g" ${dockerfile} + sed "/AS builder/s/FROM/FROM --platform=\$TARGETPLATFORM/g" ${dockerfile} } sedna::buildx::push-multi-platform-images() {