diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-03-01 18:23:07 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-03-01 18:23:07 -0800 |
| commit | 4dec5e0e4ae9da6d7749128a81d7010f7a3cd801 (patch) | |
| tree | fb19e7ea7875ffad1c720a78ea26a5549e281ce7 | |
| parent | 4532640ffd790ef71705b120803615b64713ee43 (diff) | |
| download | seaweedfs-4dec5e0e4ae9da6d7749128a81d7010f7a3cd801.tar.xz seaweedfs-4dec5e0e4ae9da6d7749128a81d7010f7a3cd801.zip | |
fix dockerhub build
| -rw-r--r-- | docker/Dockerfile.go_build | 12 | ||||
| -rw-r--r-- | docker/Dockerfile.local | 29 | ||||
| -rw-r--r-- | docker/Makefile | 2 |
3 files changed, 39 insertions, 4 deletions
diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index b4a7b6504..306ce3aa1 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -1,9 +1,15 @@ +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 + FROM alpine AS final LABEL author="Chris Lu" -COPY ./weed /usr/bin/ +COPY --from=builder /root/go/bin/weed /usr/bin/ RUN mkdir -p /etc/seaweedfs -COPY ./filer.toml /etc/seaweedfs/filer.toml -COPY ./entrypoint.sh /entrypoint.sh +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 # volume server gprc port EXPOSE 18080 diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local new file mode 100644 index 000000000..b4a7b6504 --- /dev/null +++ b/docker/Dockerfile.local @@ -0,0 +1,29 @@ +FROM alpine AS final +LABEL author="Chris Lu" +COPY ./weed /usr/bin/ +RUN mkdir -p /etc/seaweedfs +COPY ./filer.toml /etc/seaweedfs/filer.toml +COPY ./entrypoint.sh /entrypoint.sh + +# volume server gprc port +EXPOSE 18080 +# volume server http port +EXPOSE 8080 +# filer server gprc port +EXPOSE 18888 +# filer server http port +EXPOSE 8888 +# master server shared gprc port +EXPOSE 19333 +# master server shared http port +EXPOSE 9333 +# s3 server http port +EXPOSE 8333 + +RUN mkdir -p /data/filerldb2 + +VOLUME /data + +RUN chmod +x /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/Makefile b/docker/Makefile index 5a40d36d2..166188bc3 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -6,7 +6,7 @@ gen: dev build: cd ../weed; GOOS=linux go build; mv weed ../docker/ - docker build --no-cache -t chrislusf/seaweedfs:local -f Dockerfile.go_build . + docker build --no-cache -t chrislusf/seaweedfs:local -f Dockerfile.local . rm ./weed dev: build |