diff options
| author | Kevin Wang <kevinwzf0126@gmail.com> | 2020-03-09 17:56:55 +0800 |
|---|---|---|
| committer | Kevin Wang <kevinwzf0126@gmail.com> | 2020-03-09 20:58:43 +0800 |
| commit | 598be14cee71ff99827e32dbfa3fea8b8cbdc255 (patch) | |
| tree | 53c0da3266b0feb832eea2f1df41b560bc53b9f7 /build/edge | |
| parent | Merge pull request #1527 from fisherxu/refactor-rm (diff) | |
| download | kubeedge-598be14cee71ff99827e32dbfa3fea8b8cbdc255.tar.gz | |
update build image for components, fix -ldflags
Signed-off-by: Kevin Wang <kevinwzf0126@gmail.com>
Diffstat (limited to 'build/edge')
| -rw-r--r-- | build/edge/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/edge/Dockerfile b/build/edge/Dockerfile index cacb9b325..0c10c33a6 100644 --- a/build/edge/Dockerfile +++ b/build/edge/Dockerfile @@ -1,16 +1,18 @@ -ARG BUILD_FROM=golang:1.12-alpine3.10 +ARG BUILD_FROM=golang:1.13.8-alpine3.10 ARG RUN_FROM=docker:dind FROM ${BUILD_FROM} AS builder +ARG GO_LDFLAGS ARG QEMU_ARCH=x86_64 + COPY ./build/edge/tmp/qemu-${QEMU_ARCH}-static /usr/bin/ COPY . /go/src/github.com/kubeedge/kubeedge RUN apk --no-cache update && \ apk --no-cache upgrade && \ apk --no-cache add build-base linux-headers sqlite-dev binutils-gold && \ -CGO_ENABLED=1 go build -v -o /usr/local/bin/edgecore -ldflags="-w -s -extldflags -static" \ +CGO_ENABLED=1 go build -v -o /usr/local/bin/edgecore -ldflags="${GO_LDFLAGS} -w -s -extldflags -static" \ github.com/kubeedge/kubeedge/edge/cmd/edgecore FROM ${RUN_FROM} @@ -22,7 +24,7 @@ COPY --from=builder /usr/bin/qemu* /usr/bin/ ENV GOARCHAIUS_CONFIG_PATH /etc/kubeedge/edge ENV database.source /var/lib/kubeedge/edge.db -VOLUME ["/etc/kubeedge/certs", "/var/lib/edged", "/var/lib/kubeedge", "/var/run/docker.sock"] +# VOLUME ["/etc/kubeedge/certs", "/var/lib/edged", "/var/lib/kubeedge", "/var/run/docker.sock"] COPY --from=builder /usr/local/bin/edgecore /usr/local/bin/edgecore |