Update networks in docker-compose.yml (#6163)

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>

deployments/docker/cluster/docker-compose.yml

@@ -10,15 +10,11 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
-    networks:
-      - milvus
 
   pulsar:
     container_name: milvus-pulsar
     image: apachepulsar/pulsar:latest
     command: bin/pulsar standalone
-    networks:
-      - milvus
 
   minio:
     container_name: milvus-minio
@@ -32,12 +28,10 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
-    networks:
-      - milvus
 
   rootcoord:
     container_name: milvus-rootcoord
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "rootcoord"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -48,12 +42,10 @@ services:
       - "etcd"
       - "pulsar"
       - "minio"
-    networks:
-      - milvus
 
   proxy:
     container_name: milvus-proxy
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "proxy"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -61,12 +53,10 @@ services:
       PULSAR_ADDRESS: pulsar://pulsar:6650
     ports:
       - "19530:19530"
-    networks:
-      - milvus
 
   querycoord:
     container_name: milvus-querycoord
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "querycoord"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -77,12 +67,10 @@ services:
       - "etcd"
       - "pulsar"
       - "minio"
-    networks:
-      - milvus
 
   querynode:
     container_name: milvus-querynode
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "querynode"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -90,12 +78,10 @@ services:
       PULSAR_ADDRESS: pulsar://pulsar:6650
     depends_on:
       - "querycoord"
-    networks:
-      - milvus
 
   indexcoord:
     container_name: milvus-indexcoord
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "indexcoord"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -106,12 +92,10 @@ services:
       - "etcd"
       - "pulsar"
       - "minio"
-    networks:
-      - milvus
 
   indexnode:
     container_name: milvus-indexnode
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "indexnode"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -120,12 +104,10 @@ services:
       INDEX_COORD_ADDRESS: indexcoord:31000
     depends_on:
       - "indexcoord"
-    networks:
-      - milvus
 
   datacoord:
     container_name: milvus-datacoord
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "datacoord"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -136,12 +118,10 @@ services:
       - "etcd"
       - "pulsar"
       - "minio"
-    networks:
-      - milvus
 
   datanode:
     container_name: milvus-datanode
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "datanode"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -149,8 +129,7 @@ services:
       PULSAR_ADDRESS: pulsar://pulsar:6650
     depends_on:
       - "datacoord"
-    networks:
-      - milvus
 
 networks:
-  milvus:
+  default:
+    name: milvus

deployments/docker/dev/docker-compose.yml

@@ -8,8 +8,6 @@ services:
       - "2379:2379"
       - "2380:2380"
       - "4001:4001"
-    networks:
-      - milvus
 
   pulsar:
     image: apachepulsar/pulsar:latest
@@ -17,8 +15,6 @@ services:
     ports:
       - "6650:6650"
       - "18080:8080"
-    networks:
-      - milvus
 
   minio:
     image: minio/minio:RELEASE.2020-12-03T00-03-10Z
@@ -33,17 +29,13 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
-    networks:
-      - milvus
 
   jaeger:
     image: jaegertracing/all-in-one:latest
     ports:
       - "6831:6831/udp"
       - "16686:16686"
-    networks:
-      - milvus
 
 networks:
-  milvus:
-
+  default:
+    name: milvus_dev

deployments/docker/standalone/docker-compose.yml

@@ -10,8 +10,6 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
-    networks:
-      - milvus
 
   minio:
     container_name: milvus-minio
@@ -25,12 +23,10 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
-    networks:
-      - milvus
 
   standalone:
     container_name: milvus-standalone
-    image: milvusdb/milvus:latest
+    image: milvusdb/milvus-dev:master-latest
     command: ["milvus", "run", "standalone"]
     environment:
       ETCD_ENDPOINTS: etcd:2379
@@ -40,8 +36,7 @@ services:
     depends_on:
       - "etcd"
       - "minio"
-    networks:
-      - milvus
 
 networks:
-  milvus:
+  default:
+    name: milvus

docker-compose.yml

@@ -35,20 +35,14 @@ services:
     command: &ubuntu-command >
       /bin/bash -c "
         make check-proto-product && make verifiers && make unittest"
-    networks:
-      - milvus
 
   etcd:
     image: quay.io/coreos/etcd:v3.4.13
     command: etcd -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379
-    networks:
-      - milvus
 
   pulsar:
     image: apachepulsar/pulsar:2.6.1
     command: bin/pulsar standalone
-    networks:
-      - milvus
 
   minio:
     image: minio/minio:RELEASE.2020-12-03T00-03-10Z
@@ -61,13 +55,10 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
-    networks:
-      - milvus
 
   jaeger:
     image: jaegertracing/all-in-one:latest
-    networks:
-      - milvus
 
 networks:
-  milvus:
+  default:
+    name: milvus_dev

tests/docker/docker-compose.yml

@@ -19,4 +19,4 @@ services:
 networks:
   default:
     external: ${PRE_EXIST_NETWORK:-false}
-    name: ${PYTEST_NETWORK:-pytest}
+    name: ${PYTEST_NETWORK:-milvus_dev}