Merge pull request #1 from chrislusf/master

update from chrisluf 

6 files changed, 65 insertions, 14 deletions

diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build
index 85cbb6143..306ce3aa1 100644
--- a/docker/Dockerfile.go_build
+++ b/docker/Dockerfile.go_build
@@ -1,5 +1,15 @@
-FROM golang:latest
-RUN go get github.com/chrislusf/seaweedfs/weed
+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 --from=builder /root/go/bin/weed /usr/bin/
+RUN mkdir -p /etc/seaweedfs
+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
@@ -20,10 +30,6 @@ RUN mkdir -p /data/filerldb2
 
 VOLUME /data
 
-RUN mkdir -p /etc/seaweedfs
-RUN cp /go/src/github.com/chrislusf/seaweedfs/docker/filer.toml /etc/seaweedfs/filer.toml
-RUN cp /go/src/github.com/chrislusf/seaweedfs/docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
-RUN cp /go/bin/weed /usr/bin/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/README.md b/docker/README.md
index cfe281e71..1a2833c7e 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -11,11 +11,21 @@ docker-compose -f seaweedfs-compose.yml -p seaweedfs up
 
 ```
 
-## Development
+## Try latest tip
+
+```bash
+
+wget https://raw.githubusercontent.com/chrislusf/seaweedfs/master/docker/seaweedfs-dev-compose.yml
+
+docker-compose -f seaweedfs-dev-compose.yml -p seaweedfs up
+
+```
+
+## Local Development
 
 ```bash
 cd $GOPATH/src/github.com/chrislusf/seaweedfs/docker
 
-docker-compose -f dev-compose.yml -p seaweedfs up
+docker-compose -f local-dev-compose.yml -p seaweedfs up
 
 ```
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index c28bd263c..791527d3a 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,7 +3,7 @@
 case "$1" in
 
   'master')
-  	ARGS="-ip `hostname -i` -mdir /data"
+  	ARGS="-mdir /data"
 	# Is this instance linked with an other master? (Docker commandline "--link master1:master")
 	if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
 		ARGS="$ARGS -peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
diff --git a/docker/dev-compose.yml b/docker/local-dev-compose.yml
index 0306b3cb0..c2f588a60 100644
--- a/docker/dev-compose.yml
+++ b/docker/local-dev-compose.yml
@@ -8,7 +8,7 @@ services:
     ports:
     - 9333:9333
     - 19333:19333
-    command: "master"
+    command: "master -ip=master"
   volume:
     build:
       context: .
@@ -16,7 +16,7 @@ services:
     ports:
     - 8080:8080
     - 18080:18080
-    command: 'volume -max=5 -mserver="master:9333" -port=8080'
+    command: '-v=2 volume -max=5 -mserver="master:9333" -port=8080 -ip=volume'
     depends_on:
     - master
   filer:
@@ -26,7 +26,7 @@ services:
     ports:
     - 8888:8888
     - 18888:18888
-    command: 'filer -master="master:9333"'
+    command: '-v=4 filer -master="master:9333"'
     depends_on:
     - master
     - volume
@@ -36,7 +36,7 @@ services:
       dockerfile: Dockerfile.go_build
     ports:
     - 8333:8333
-    command: 's3 -filer="filer:8888"'
+    command: '-v=4 s3 -filer="filer:8888"'
     depends_on:
     - master
     - volume
diff --git a/docker/seaweedfs-compose.yml b/docker/seaweedfs-compose.yml
index d66b921bb..7f0cbc6f9 100644
--- a/docker/seaweedfs-compose.yml
+++ b/docker/seaweedfs-compose.yml
@@ -6,7 +6,7 @@ services:
     ports:
     - 9333:9333
     - 19333:19333
-    command: "master"
+    command: "master -ip=master"
   volume:
     image: chrislusf/seaweedfs # use a remote image
     ports:
diff --git a/docker/seaweedfs-dev-compose.yml b/docker/seaweedfs-dev-compose.yml
new file mode 100644
index 000000000..765770084
--- /dev/null
+++ b/docker/seaweedfs-dev-compose.yml
@@ -0,0 +1,35 @@
+version: '2'
+
+services:
+  master:
+    image: chrislusf/seaweedfs:dev # use a remote dev image
+    ports:
+    - 9333:9333
+    - 19333:19333
+    command: "master -ip=master"
+  volume:
+    image: chrislusf/seaweedfs:dev # use a remote dev image
+    ports:
+    - 8080:8080
+    - 18080:18080
+    command: '-v=2 volume -max=5 -mserver="master:9333" -port=8080 -ip=volume'
+    depends_on:
+    - master
+  filer:
+    image: chrislusf/seaweedfs:dev # use a remote dev image
+    ports:
+    - 8888:8888
+    - 18888:18888
+    command: '-v=4 filer -master="master:9333"'
+    depends_on:
+    - master
+    - volume
+  s3:
+    image: chrislusf/seaweedfs:dev # use a remote dev image
+    ports:
+    - 8333:8333
+    command: '-v=4 s3 -filer="filer:8888"'
+    depends_on:
+    - master
+    - volume
+    - filer