diff options
| author | hilimd <68371223+hilimd@users.noreply.github.com> | 2020-10-19 15:16:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 15:16:44 +0800 |
| commit | 2c40f56e5a2e4792361b6df0bb6e879726f340ab (patch) | |
| tree | f6f3187326108f096fff59930b1589705bb416a2 /docker | |
| parent | 6e63e5eaf0c713cac3ee48c16bc1803c3509afdc (diff) | |
| parent | 69f0da5d73b6f681b2313e3230a39e254693f453 (diff) | |
| download | seaweedfs-2c40f56e5a2e4792361b6df0bb6e879726f340ab.tar.xz seaweedfs-2c40f56e5a2e4792361b6df0bb6e879726f340ab.zip | |
Merge pull request #30 from chrislusf/master
sync
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.go_build | 4 | ||||
| -rw-r--r-- | docker/Dockerfile.go_build_large | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index 306ce3aa1..29b9a85d8 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -2,7 +2,9 @@ FROM frolvlad/alpine-glibc as builder RUN apk add git go g++ RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs -RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install +RUN cd /go/src/github.com/chrislusf/seaweedfs/weed \ + && export LDFLAGS="-X github.com/chrislusf/seaweedfs/weed/util.COMMIT=$(git rev-parse --short HEAD)" \ + && go install -ldflags "${LDFLAGS}" FROM alpine AS final LABEL author="Chris Lu" diff --git a/docker/Dockerfile.go_build_large b/docker/Dockerfile.go_build_large index e0af93173..fa22aeade 100644 --- a/docker/Dockerfile.go_build_large +++ b/docker/Dockerfile.go_build_large @@ -2,7 +2,9 @@ FROM frolvlad/alpine-glibc as builder RUN apk add git go g++ RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs -RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install -tags 5BytesOffset +RUN cd /go/src/github.com/chrislusf/seaweedfs/weed \ + && export LDFLAGS="-X github.com/chrislusf/seaweedfs/weed/util.COMMIT=$(git rev-parse --short HEAD)" \ + && go install -tags 5BytesOffset -ldflags "${LDFLAGS}" FROM alpine AS final LABEL author="Chris Lu" |