diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-12-17 11:06:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 11:06:39 -0800 |
| commit | 99990a3c911ab01aab5808ebc91b035170aa5ec6 (patch) | |
| tree | b7e3e0cc4cd45bac21e840ac9de309fa07274d06 | |
| parent | b789767cd1059eeba393e3bdcf98b136e64db6eb (diff) | |
| parent | a37f0692961e66d8f02db164a6a19c04c4cdbd46 (diff) | |
| download | seaweedfs-99990a3c911ab01aab5808ebc91b035170aa5ec6.tar.xz seaweedfs-99990a3c911ab01aab5808ebc91b035170aa5ec6.zip | |
Merge pull request #1686 from LazyDBA247-Anyvision/master
fix Argument Name, and use the correct one.
| -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}" |