Browse Source

Merge pull request #215 from JimmyYang20/fixbug

Fix building wrong GM/LC arm64 docker images
tags/v0.4.3
KubeEdge Bot GitHub 4 years ago
parent
commit
1ce64fcaf7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
  1. +2
    -1
      Makefile
  2. +1
    -1
      hack/lib/buildx.sh

+ 2
- 1
Makefile View File

@@ -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 . 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-all: push-multi-platform-images push-examples


# push target pushes sedna-built images # push target pushes sedna-built images
@@ -154,6 +154,7 @@ push: images


push-examples: push-examples:
bash examples/push_image.sh bash examples/push_image.sh

# push multi-platform images # push multi-platform images
push-multi-platform-images: push-multi-platform-images:
bash hack/make-rules/push.sh bash hack/make-rules/push.sh


+ 1
- 1
hack/lib/buildx.sh View File

@@ -38,7 +38,7 @@ sedna::buildx::prepare_env() {


sedna::buildx:generate-dockerfile() { sedna::buildx:generate-dockerfile() {
dockerfile=${1} 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() { sedna::buildx::push-multi-platform-images() {


Loading…
Cancel
Save