Skip to content

Commit

Permalink
Merge pull request #215 from JimmyYang20/fixbug
Browse files Browse the repository at this point in the history
Fix building wrong GM/LC arm64 docker images
  • Loading branch information
kubeedge-bot authored Nov 2, 2021
2 parents a760f17 + e95caf9 commit 1ce64fc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/buildx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 1ce64fc

Please sign in to comment.