milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove .env and update docker-compose yml (#5048) 

* remove .env and update docker-compose yml
pull/5032/head^2
Cai Yudong 2021-04-26 11:31:23 +08:00 committed by GitHub
parent 74f457bd14
commit d4e7b4d1a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployments/docker/.env
View File

@ -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

92
deployments/docker/docker-compose.distributed.yml → deployments/docker/distributed/docker-compose.yml
View File

@ -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:

41
deployments/docker/docker-compose.yml
View File

@ -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

6
deployments/docker/docker-compose.standalone.yml → deployments/docker/singlenode/docker-compose.yml
View File

@ -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: