From 40945a60cfddde46ccf2c6f7c6f9170d61fde959 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 10 May 2021 00:13:36 -0700 Subject: [PATCH] use go 1.16.4 to build docker image --- docker/Dockerfile.go_build | 6 +++--- docker/Dockerfile.go_build_large | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index 1adf0f5ef..01334280d 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -1,5 +1,5 @@ -FROM frolvlad/alpine-glibc as builder -RUN apk add git go g++ fuse +FROM amd64/golang:1.16-alpine as builder +RUN apk add git g++ fuse RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs ARG BRANCH=${BRANCH:-master} @@ -10,7 +10,7 @@ RUN cd /go/src/github.com/chrislusf/seaweedfs/weed \ FROM alpine AS final LABEL author="Chris Lu" -COPY --from=builder /root/go/bin/weed /usr/bin/ +COPY --from=builder /go/bin/weed /usr/bin/ RUN mkdir -p /etc/seaweedfs COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/filer.toml /etc/seaweedfs/filer.toml COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/entrypoint.sh /entrypoint.sh diff --git a/docker/Dockerfile.go_build_large b/docker/Dockerfile.go_build_large index 48af3381d..2d67a1924 100644 --- a/docker/Dockerfile.go_build_large +++ b/docker/Dockerfile.go_build_large @@ -1,5 +1,5 @@ -FROM frolvlad/alpine-glibc as builder -RUN apk add git go g++ fuse +FROM amd64/golang:1.16-alpine as builder +RUN apk add git g++ fuse RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs ARG BRANCH=${BRANCH:-master} @@ -10,7 +10,7 @@ RUN cd /go/src/github.com/chrislusf/seaweedfs/weed \ FROM alpine AS final LABEL author="Chris Lu" -COPY --from=builder /root/go/bin/weed /usr/bin/ +COPY --from=builder /go/bin/weed /usr/bin/ RUN mkdir -p /etc/seaweedfs COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/filer.toml /etc/seaweedfs/filer.toml COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/entrypoint.sh /entrypoint.sh