diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-12-17 13:05:20 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-12-17 13:05:20 -0800 |
| commit | daa8157fc2afc7c4caa1f8c04bc06c1fb32b193f (patch) | |
| tree | 5b0c367299e31b7db974663f9bed57e0c526b9e8 /docker | |
| parent | f56e6d231e86ff1ca5fefcda220012ee121c88a5 (diff) | |
| parent | e2076201d79e84df0407a9e1e535bf966452bba0 (diff) | |
| download | seaweedfs-daa8157fc2afc7c4caa1f8c04bc06c1fb32b193f.tar.xz seaweedfs-daa8157fc2afc7c4caa1f8c04bc06c1fb32b193f.zip | |
Merge branch 'master' into support_ssd_volume
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.go_build | 4 | ||||
| -rw-r--r-- | docker/Dockerfile.go_build_large | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index a5f8725e0..726046b56 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -2,8 +2,8 @@ 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 -ARG branch=${branch:-master} -RUN cd /go/src/github.com/chrislusf/seaweedfs && git checkout $ARG +ARG BRANCH=${BRANCH:-master} +RUN cd /go/src/github.com/chrislusf/seaweedfs && git checkout $BRANCH 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}" diff --git a/docker/Dockerfile.go_build_large b/docker/Dockerfile.go_build_large index c3ea4e606..8fc85e868 100644 --- a/docker/Dockerfile.go_build_large +++ b/docker/Dockerfile.go_build_large @@ -2,8 +2,8 @@ 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 -ARG branch=${branch:-master} -RUN cd /go/src/github.com/chrislusf/seaweedfs && git checkout $ARG +ARG BRANCH=${BRANCH:-master} +RUN cd /go/src/github.com/chrislusf/seaweedfs && git checkout $BRANCH 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}" |