From dc63d825959f73e0428bbce8c6367d1537d25573 Mon Sep 17 00:00:00 2001
From: Cai Yudong <yudong.cai@zilliz.com>
Date: Fri, 25 Jun 2021 15:52:10 +0800
Subject: [PATCH] Update docker-compose.yml (#6116)

* rename master and service in docker-compose.yml

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>

* update docker-compose.yml

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
---
 deployments/docker/cluster/docker-compose.yml | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/deployments/docker/cluster/docker-compose.yml b/deployments/docker/cluster/docker-compose.yml
index 6489087ee7..bcf932f14c 100644
--- a/deployments/docker/cluster/docker-compose.yml
+++ b/deployments/docker/cluster/docker-compose.yml
@@ -41,10 +41,9 @@ services:
     command: ["milvus", "run", "rootcoord"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
+      MINIO_ADDRESS: minio:9000
       PULSAR_ADDRESS: pulsar://pulsar:6650
-      DATA_SERVICE_ADDRESS: datacoord:13333
-      INDEX_SERVICE_ADDRESS: indexcoord:31000
-      QUERY_SERVICE_ADDRESS: querycoord:19531
+      ROOT_COORD_ADDRESS: rootcoord:53100
     depends_on:
       - "etcd"
       - "pulsar"
@@ -58,11 +57,8 @@ services:
     command: ["milvus", "run", "proxy"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
+      MINIO_ADDRESS: minio:9000
       PULSAR_ADDRESS: pulsar://pulsar:6650
-      MASTER_ADDRESS: master:53100
-      DATA_SERVICE_ADDRESS: datacoord:13333
-      INDEX_SERVICE_ADDRESS: indexcoord:31000
-      QUERY_SERVICE_ADDRESS: querycoord:19531
     ports:
       - "19530:19530"
     networks:
@@ -73,8 +69,10 @@ services:
     image: milvusdb/milvus:latest
     command: ["milvus", "run", "querycoord"]
     environment:
-      MASTER_ADDRESS: master:53100
-      DATA_SERVICE_ADDRESS: datacoord:13333
+      ETCD_ENDPOINTS: etcd:2379
+      MINIO_ADDRESS: minio:9000
+      PULSAR_ADDRESS: pulsar://pulsar:6650
+      QUERY_COORD_ADDRESS: querycoord:19531
     depends_on:
       - "etcd"
       - "pulsar"
@@ -87,12 +85,9 @@ services:
     image: milvusdb/milvus:latest
     command: ["milvus", "run", "querynode"]
     environment:
+      ETCD_ENDPOINTS: etcd:2379
       MINIO_ADDRESS: minio:9000
       PULSAR_ADDRESS: pulsar://pulsar:6650
-      MASTER_ADDRESS: master:53100
-      DATA_SERVICE_ADDRESS: datacoord:13333
-      INDEX_SERVICE_ADDRESS: indexcoord:31000
-      QUERY_SERVICE_ADDRESS: querycoord:19531
     depends_on:
       - "querycoord"
     networks:
@@ -105,7 +100,8 @@ services:
     environment:
       ETCD_ENDPOINTS: etcd:2379
       MINIO_ADDRESS: minio:9000
-      MASTER_ADDRESS: master:53100
+      PULSAR_ADDRESS: pulsar://pulsar:6650
+      INDEX_COORD_ADDRESS: indexcoord:31000
     depends_on:
       - "etcd"
       - "pulsar"
@@ -118,8 +114,10 @@ services:
     image: milvusdb/milvus:latest
     command: ["milvus", "run", "indexnode"]
     environment:
+      ETCD_ENDPOINTS: etcd:2379
       MINIO_ADDRESS: minio:9000
-      INDEX_SERVICE_ADDRESS: indexcoord:31000
+      PULSAR_ADDRESS: pulsar://pulsar:6650
+      INDEX_COORD_ADDRESS: indexcoord:31000
     depends_on:
       - "indexcoord"
     networks:
@@ -133,7 +131,7 @@ services:
       ETCD_ENDPOINTS: etcd:2379
       MINIO_ADDRESS: minio:9000
       PULSAR_ADDRESS: pulsar://pulsar:6650
-      MASTER_ADDRESS: master:53100
+      DATA_COORD_ADDRESS: datacoord:13333
     depends_on:
       - "etcd"
       - "pulsar"
@@ -149,8 +147,6 @@ services:
       ETCD_ENDPOINTS: etcd:2379
       MINIO_ADDRESS: minio:9000
       PULSAR_ADDRESS: pulsar://pulsar:6650
-      MASTER_ADDRESS: master:53100
-      DATA_SERVICE_ADDRESS: datacoord:13333
     depends_on:
       - "datacoord"
     networks: