diff options
| author | gy95 <guoyao17@huawei.com> | 2021-12-28 21:26:13 +0800 |
|---|---|---|
| committer | gy95 <guoyao17@huawei.com> | 2021-12-29 11:44:43 +0800 |
| commit | 18a90efd986871782b74b5a6266035d53a3307da (patch) | |
| tree | dc53c35e812c9333a9db76d2b8e9d5478f7e2e67 | |
| parent | Merge pull request #3505 from fisherxu/stale-bot (diff) | |
| download | kubeedge-18a90efd986871782b74b5a6266035d53a3307da.tar.gz | |
simplify edgecore image build
Signed-off-by: gy95 <guoyao17@huawei.com>
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | build/edge/Dockerfile | 5 |
2 files changed, 5 insertions, 10 deletions
@@ -326,15 +326,7 @@ iptablesmgrimage: .PHONY: edgeimage edgeimage: - mkdir -p ./build/edge/tmp - rm -rf ./build/edge/tmp/* - curl -L -o ./build/edge/tmp/qemu-${QEMU_ARCH}-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v3.0.0/qemu-${QEMU_ARCH}-static.tar.gz - tar -xzf ./build/edge/tmp/qemu-${QEMU_ARCH}-static.tar.gz -C ./build/edge/tmp - docker build -t kubeedge/edgecore:${IMAGE_TAG} \ - --build-arg GO_LDFLAGS=${GO_LDFLAGS} \ - --build-arg BUILD_FROM=${ARCH}/golang:1.16-alpine3.13 \ - --build-arg RUN_FROM=${ARCH}/docker:dind \ - -f build/edge/Dockerfile . + docker build --build-arg GO_LDFLAGS=${GO_LDFLAGS} -t kubeedge/edgecore:${IMAGE_TAG} -f build/edge/Dockerfile . .PHONY: edgesite-server-image edgesite-server-image: diff --git a/build/edge/Dockerfile b/build/edge/Dockerfile index 52b3761f7..b4ef5a0db 100644 --- a/build/edge/Dockerfile +++ b/build/edge/Dockerfile @@ -6,7 +6,10 @@ FROM ${BUILD_FROM} AS builder ARG GO_LDFLAGS ARG QEMU_ARCH=x86_64 -COPY ./build/edge/tmp/qemu-${QEMU_ARCH}-static /usr/bin/ +RUN apk update && apk add curl && \ +curl -L -o /tmp/qemu-${QEMU_ARCH}-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v3.0.0/qemu-${QEMU_ARCH}-static.tar.gz && \ +tar -xzf /tmp/qemu-${QEMU_ARCH}-static.tar.gz -C /usr/bin + COPY . /go/src/github.com/kubeedge/kubeedge RUN apk --no-cache update && \ |