From d4e7b4d1a47d3add174da5694c36e30ec7fb4c34 Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Mon, 26 Apr 2021 11:31:23 +0800 Subject: [PATCH] remove .env and update docker-compose yml (#5048) * remove .env and update docker-compose yml --- deployments/docker/.env | 10 -- .../docker-compose.yml} | 92 +++++++++---------- deployments/docker/docker-compose.yml | 41 --------- .../docker-compose.yml} | 6 +- 4 files changed, 49 insertions(+), 100 deletions(-) delete mode 100644 deployments/docker/.env rename deployments/docker/{docker-compose.distributed.yml => distributed/docker-compose.yml} (54%) rename deployments/docker/{docker-compose.standalone.yml => singlenode/docker-compose.yml} (87%) diff --git a/deployments/docker/.env b/deployments/docker/.env deleted file mode 100644 index 815618eeef..0000000000 --- a/deployments/docker/.env +++ /dev/null @@ -1,10 +0,0 @@ -TARGET_DOCKER_IMAGE=registry.zilliz.com/milvus-distributed/milvus-distributed:release -PULSAR_ADDRESS=pulsar://pulsar:6650 -ETCD_ADDRESS=etcd:2379 -MINIO_ADDRESS=minio:9000 -MASTER_ADDRESS=master:53100 -PROXY_SERVICE_ADDRESS=proxyservice:21122 -INDEX_SERVICE_ADDRESS=indexservice:31000 -DATA_SERVICE_ADDRESS=dataservice:13333 -QUERY_SERVICE_ADDRESS=queryservice:19531 -QUERY_NODE_ID=1 diff --git a/deployments/docker/docker-compose.distributed.yml b/deployments/docker/distributed/docker-compose.yml similarity index 54% rename from deployments/docker/docker-compose.distributed.yml rename to deployments/docker/distributed/docker-compose.yml index fe065aa030..12f31619ca 100644 --- a/deployments/docker/docker-compose.distributed.yml +++ b/deployments/docker/distributed/docker-compose.yml @@ -37,15 +37,15 @@ services: - milvus master: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "master"] environment: - PULSAR_ADDRESS: ${PULSAR_ADDRESS} - ETCD_ADDRESS: ${ETCD_ADDRESS} - INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS} - DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS} - QUERY_SERVICE_ADDRESS: ${QUERY_SERVICE_ADDRESS} - PROXY_SERVICE_ADDRESS: ${PROXY_SERVICE_ADDRESS} + ETCD_ADDRESS: etcd:2379 + PULSAR_ADDRESS: pulsar://pulsar:6650 + DATA_SERVICE_ADDRESS: dataservice:13333 + INDEX_SERVICE_ADDRESS: indexservice:31000 + QUERY_SERVICE_ADDRESS: queryservice:19531 + PROXY_SERVICE_ADDRESS: proxyservice:21122 depends_on: - "etcd" - "pulsar" @@ -54,10 +54,10 @@ services: - milvus proxyservice: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "proxyservice"] environment: - PULSAR_ADDRESS: ${PULSAR_ADDRESS} + PULSAR_ADDRESS: pulsar://pulsar:6650 depends_on: - "etcd" - "pulsar" @@ -66,16 +66,16 @@ services: - milvus proxynode: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "proxynode"] environment: - ETCD_ADDRESS: ${ETCD_ADDRESS} - PULSAR_ADDRESS: ${PULSAR_ADDRESS} - MASTER_ADDRESS: ${MASTER_ADDRESS} - PROXY_SERVICE_ADDRESS: ${PROXY_SERVICE_ADDRESS} - INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS} - DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS} - QUERY_SERVICE_ADDRESS: ${QUERY_SERVICE_ADDRESS} + ETCD_ADDRESS: etcd:2379 + PULSAR_ADDRESS: pulsar://pulsar:6650 + MASTER_ADDRESS: master:53100 + DATA_SERVICE_ADDRESS: dataservice:13333 + INDEX_SERVICE_ADDRESS: indexservice:31000 + QUERY_SERVICE_ADDRESS: queryservice:19531 + PROXY_SERVICE_ADDRESS: proxyservice:21122 ports: - "19530:19530" depends_on: @@ -84,11 +84,11 @@ services: - milvus queryservice: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "queryservice"] environment: - MASTER_ADDRESS: ${MASTER_ADDRESS} - DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS} + MASTER_ADDRESS: master:53100 + DATA_SERVICE_ADDRESS: dataservice:13333 depends_on: - "etcd" - "pulsar" @@ -97,28 +97,28 @@ services: - milvus querynode: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "querynode"] environment: - PULSAR_ADDRESS: ${PULSAR_ADDRESS} - MASTER_ADDRESS: ${MASTER_ADDRESS} - MINIO_ADDRESS: ${MINIO_ADDRESS} - DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS} - INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS} - QUERY_SERVICE_ADDRESS: ${QUERY_SERVICE_ADDRESS} - QUERY_NODE_ID: ${QUERY_NODE_ID} + MINIO_ADDRESS: minio:9000 + PULSAR_ADDRESS: pulsar://pulsar:6650 + MASTER_ADDRESS: master:53100 + DATA_SERVICE_ADDRESS: dataservice:13333 + INDEX_SERVICE_ADDRESS: indexservice:31000 + QUERY_SERVICE_ADDRESS: queryservice:19531 + QUERY_NODE_ID: 1 depends_on: - "queryservice" networks: - milvus indexservice: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "indexservice"] environment: - MASTER_ADDRESS: ${MASTER_ADDRESS} - ETCD_ADDRESS: ${ETCD_ADDRESS} - MINIO_ADDRESS: ${MINIO_ADDRESS} + ETCD_ADDRESS: etcd:2379 + MINIO_ADDRESS: minio:9000 + MASTER_ADDRESS: master:53100 depends_on: - "etcd" - "pulsar" @@ -127,24 +127,24 @@ services: - milvus indexnode: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "indexnode"] environment: - INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS} - MINIO_ADDRESS: ${MINIO_ADDRESS} + MINIO_ADDRESS: minio:9000 + INDEX_SERVICE_ADDRESS: indexservice:31000 depends_on: - "indexservice" networks: - milvus dataservice: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "dataservice"] environment: - PULSAR_ADDRESS: ${PULSAR_ADDRESS} - ETCD_ADDRESS: ${ETCD_ADDRESS} - MASTER_ADDRESS: ${MASTER_ADDRESS} - MINIO_ADDRESS: ${MINIO_ADDRESS} + ETCD_ADDRESS: etcd:2379 + MINIO_ADDRESS: minio:9000 + PULSAR_ADDRESS: pulsar://pulsar:6650 + MASTER_ADDRESS: master:53100 depends_on: - "etcd" - "pulsar" @@ -153,14 +153,14 @@ services: - milvus datanode: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/milvus", "run", "datanode"] environment: - PULSAR_ADDRESS: ${PULSAR_ADDRESS} - ETCD_ADDRESS: ${ETCD_ADDRESS} - MASTER_ADDRESS: ${MASTER_ADDRESS} - MINIO_ADDRESS: ${MINIO_ADDRESS} - DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS} + ETCD_ADDRESS: etcd:2379 + MINIO_ADDRESS: minio:9000 + PULSAR_ADDRESS: pulsar://pulsar:6650 + MASTER_ADDRESS: master:53100 + DATA_SERVICE_ADDRESS: dataservice:13333 depends_on: - "dataservice" networks: diff --git a/deployments/docker/docker-compose.yml b/deployments/docker/docker-compose.yml index 0ae708a19e..c116486236 100644 --- a/deployments/docker/docker-compose.yml +++ b/deployments/docker/docker-compose.yml @@ -47,44 +47,3 @@ services: networks: milvus: -# pd0: -# image: pingcap/pd:latest -# network_mode: "host" -# ports: -# - "2379:2379" -# - "2380:2380" -# volumes: -# - /tmp/config/pd.toml:/pd.toml:ro -# - /tmp/data:/data -# - /tmp/logs:/logs -# - /etc/localtime:/etc/localtime:ro -# command: -# - --name=pd0 -# - --client-urls=http://0.0.0.0:2379 -# - --peer-urls=http://0.0.0.0:2380 -# - --advertise-client-urls=http://127.0.0.1:2379 -# - --advertise-peer-urls=http://127.0.0.1:2380 -# - --initial-cluster=pd0=http://127.0.0.1:2380 -# - --data-dir=/data/pd0 -# - --log-file=/logs/pd0.log -# restart: on-failure -# -# tikv0: -# network_mode: "host" -# image: pingcap/tikv:latest -# ports: -# - "20160:20160" -# volumes: -# - /tmp/config/tikv.toml:/tikv.toml:ro -# - /tmp/data:/data -# - /tmp/logs:/logs -# - /etc/localtime:/etc/localtime:ro -# command: -# - --addr=0.0.0.0:20160 -# - --advertise-addr=127.0.0.1:20160 -# - --data-dir=/data/tikv0 -# - --pd=127.0.0.1:2379 -# - --log-file=/logs/tikv0.log -# depends_on: -# - "pd0" -# restart: on-failure diff --git a/deployments/docker/docker-compose.standalone.yml b/deployments/docker/singlenode/docker-compose.yml similarity index 87% rename from deployments/docker/docker-compose.standalone.yml rename to deployments/docker/singlenode/docker-compose.yml index 9cefcf37d9..842b2806bf 100644 --- a/deployments/docker/docker-compose.standalone.yml +++ b/deployments/docker/singlenode/docker-compose.yml @@ -28,11 +28,11 @@ services: - milvus standalone: - image: ${TARGET_DOCKER_IMAGE} + image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release command: ["/milvus-distributed/bin/singlenode"] environment: - ETCD_ADDRESS: ${ETCD_ADDRESS} - MINIO_ADDRESS: ${MINIO_ADDRESS} + ETCD_ADDRESS: etcd:2379 + MINIO_ADDRESS: minio:9000 ports: - "19530:19530" depends_on: