Merge remote-tracking branch 'upstream/master'

1 files changed, 20 insertions, 28 deletions

diff --git a/docker/local-dev-compose.yml b/docker/local-dev-compose.yml
index c2f588a60..f6fd0f4ce 100644
--- a/docker/local-dev-compose.yml
+++ b/docker/local-dev-compose.yml
@@ -2,42 +2,34 @@ version: '2'
 
 services:
   master:
-    build:
-      context: .
-      dockerfile: Dockerfile.go_build
+    image: chrislusf/seaweedfs:local
     ports:
-    - 9333:9333
-    - 19333:19333
+      - 9333:9333
+      - 19333:19333
     command: "master -ip=master"
   volume:
-    build:
-      context: .
-      dockerfile: Dockerfile.go_build
+    image: chrislusf/seaweedfs:local
     ports:
-    - 8080:8080
-    - 18080:18080
-    command: '-v=2 volume -max=5 -mserver="master:9333" -port=8080 -ip=volume'
+      - 8080:8080
+      - 18080:18080
+    command: "volume -mserver=master:9333 -port=8080 -ip=volume"
     depends_on:
-    - master
+      - master
   filer:
-    build:
-      context: .
-      dockerfile: Dockerfile.go_build
+    image: chrislusf/seaweedfs:local
     ports:
-    - 8888:8888
-    - 18888:18888
-    command: '-v=4 filer -master="master:9333"'
+      - 8888:8888
+      - 18888:18888
+    command: 'filer -master="master:9333"'
     depends_on:
-    - master
-    - volume
+      - master
+      - volume
   s3:
-    build:
-      context: .
-      dockerfile: Dockerfile.go_build
+    image: chrislusf/seaweedfs:local
     ports:
-    - 8333:8333
-    command: '-v=4 s3 -filer="filer:8888"'
+      - 8333:8333
+    command: 's3 -filer="filer:8888"'
     depends_on:
-    - master
-    - volume
-    - filer
+      - master
+      - volume
+      - filer