diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-12-15 09:32:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 09:32:33 -0800 |
| commit | fc05963fa38433ce32811e9b4e9d5d2bd8ad5e30 (patch) | |
| tree | 550ddd2c86562466763b3525107738813102b2b9 | |
| parent | 3c7f9633eb8811ee1298bb7db53eb9d587dcb125 (diff) | |
| parent | 2ac31da89e5c7b017198b704055427600975ae8e (diff) | |
| download | seaweedfs-fc05963fa38433ce32811e9b4e9d5d2bd8ad5e30.tar.xz seaweedfs-fc05963fa38433ce32811e9b4e9d5d2bd8ad5e30.zip | |
Merge pull request #1681 from LazyDBA247-Anyvision/master
Dockerfile: support build branches other than master
| -rw-r--r-- | docker/Dockerfile.go_build | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.go_build_large | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index 29b9a85d8..a5f8725e0 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -2,6 +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 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 fa22aeade..c3ea4e606 100644 --- a/docker/Dockerfile.go_build_large +++ b/docker/Dockerfile.go_build_large @@ -2,6 +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 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}" |