renaming to docker/seaweedfs-compose.yml

4 files changed, 45 insertions, 59 deletions

diff --git a/docker/README.md b/docker/README.md
index 54db588f2..cfe281e71 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,9 +5,9 @@
 
 ```bash
 
-wget https://raw.githubusercontent.com/chrislusf/seaweedfs/master/docker/docker-compose.yml
+wget https://raw.githubusercontent.com/chrislusf/seaweedfs/master/docker/seaweedfs-compose.yml
 
-docker-compose -f docker-compose.yml up
+docker-compose -f seaweedfs-compose.yml -p seaweedfs up
 
 ```
 
@@ -16,8 +16,6 @@ docker-compose -f docker-compose.yml up
 ```bash
 cd $GOPATH/src/github.com/chrislusf/seaweedfs/docker
 
-docker build - < Dockerfile.go_build
-
-docker-compose -f docker-compose.yml up
+docker-compose -f dev-compose.yml -p seaweedfs up
 
 ```
diff --git a/docker/dev-compose.yml b/docker/dev-compose.yml
new file mode 100644
index 000000000..e107782e8
--- /dev/null
+++ b/docker/dev-compose.yml
@@ -0,0 +1,42 @@
+version: '2'
+
+services:
+  master:
+    build:
+      context: .
+      dockerfile: Dockerfile.go_build
+    ports:
+    - 9333:9333
+    command: "master"
+  volume:
+    build:
+      context: .
+      dockerfile: Dockerfile.go_build
+    ports:
+    - 8080:8080
+    - 18080:18080
+    command: 'volume -max=5 -mserver="master:9333" -port=8080'
+    depends_on:
+    - master
+  filer:
+    build:
+      context: .
+      dockerfile: Dockerfile.go_build
+    ports:
+    - 8888:8888
+    - 18888:18888
+    command: 'filer -master="master:9333"'
+    depends_on:
+    - master
+    - volume
+  s3:
+    build:
+      context: .
+      dockerfile: Dockerfile.go_build
+    ports:
+    - 8333:8333
+    command: 's3 -filer="filer:8888"'
+    depends_on:
+    - master
+    - volume
+    - filer
diff --git a/docker/local-compose.yml b/docker/local-compose.yml
deleted file mode 100644
index 2c3679885..000000000
--- a/docker/local-compose.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-version: '2'
-
-services:
-  master:
-    #image: chrislusf/seaweedfs # use a remote image
-    build: . # build our container from the local Dockerfile
-    ports:
-    - 9333:9333
-    command: "master"
-    networks:
-      default:
-        aliases:
-        - seaweed_master
-  volume:
-    #image: chrislusf/seaweedfs # use a remote image
-    build: . # build our container from the local Dockerfile
-    ports:
-    - 8080:8080
-    - 18080:18080
-    command: 'volume -max=5 -mserver="master:9333" -port=8080'
-    depends_on:
-    - master
-    networks:
-      default:
-        aliases:
-        - seaweed_volume
-  filer:
-    #image: chrislusf/seaweedfs # use a remote image
-    build: . # build our container from the local Dockerfile
-    ports:
-    - 8888:8888
-    - 18888:18888
-    command: 'filer -master="master:9333"'
-    depends_on:
-    - master
-    - volume
-    networks:
-      default:
-        aliases:
-        - seaweed_filer
-  s3:
-    #image: chrislusf/seaweedfs # use a remote image
-    build: . # build our container from the local Dockerfile
-    ports:
-    - 8333:8333
-    command: 's3 -filer="filer:8888"'
-    depends_on:
-    - master
-    - volume
-    - filer
-    networks:
-      default:
-        aliases:
-        - seaweed_s3
diff --git a/docker/docker-compose.yml b/docker/seaweedfs-compose.yml
index b5105adea..b5105adea 100644
--- a/docker/docker-compose.yml
+++ b/docker/seaweedfs-compose.yml