From fd84cf7c55fb63e66a066052897b1bd6d6e73830 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Wed, 21 Jul 2021 16:48:11 +0800 Subject: [PATCH] Data persistence with docker compose deployments (#6702) Signed-off-by: quicksilver --- deployments/docker/cluster/docker-compose.yml | 22 ++++++++++++------- .../docker/standalone/docker-compose.yml | 8 ++++++- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/deployments/docker/cluster/docker-compose.yml b/deployments/docker/cluster/docker-compose.yml index da47bd88ea..c977d2ae6d 100644 --- a/deployments/docker/cluster/docker-compose.yml +++ b/deployments/docker/cluster/docker-compose.yml @@ -4,7 +4,9 @@ services: etcd: container_name: milvus-etcd image: quay.io/coreos/etcd:latest - command: etcd -listen-peer-urls=http://127.0.0.1:2380 -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 -initial-advertise-peer-urls=http://127.0.0.1:2380 --listen-metrics-urls=http://127.0.0.1:2381 --initial-cluster default=http://127.0.0.1:2380 + volumes: + - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/etcd:/etcd + command: etcd -listen-peer-urls=http://127.0.0.1:2380 -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 -initial-advertise-peer-urls=http://127.0.0.1:2380 --listen-metrics-urls=http://127.0.0.1:2381 --initial-cluster default=http://127.0.0.1:2380 --data-dir /etcd healthcheck: test: ["CMD", "wget", "-q", "--tries=1", "--spider", "http://localhost:2381/health"] interval: 30s @@ -14,6 +16,8 @@ services: pulsar: container_name: milvus-pulsar image: apachepulsar/pulsar:latest + volumes: + - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/pulsar:/pulsar/data command: > /bin/sh -c " echo "" >> /pulsar/conf/standalone.conf && \ @@ -29,6 +33,8 @@ services: environment: MINIO_ACCESS_KEY: minioadmin MINIO_SECRET_KEY: minioadmin + volumes: + - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/minio:/minio_data command: minio server /minio_data healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] @@ -52,7 +58,7 @@ services: proxy: container_name: milvus-proxy - image: milvusdb/milvus:v2.0.0-rc1-20210628-b87baa1 + image: milvusdb/milvus:v2.0.0-rc2-20210712-a8e5fd2 command: ["milvus", "run", "proxy"] environment: ETCD_ENDPOINTS: etcd:2379 @@ -63,7 +69,7 @@ services: querycoord: container_name: milvus-querycoord - image: milvusdb/milvus:v2.0.0-rc1-20210628-b87baa1 + image: milvusdb/milvus:v2.0.0-rc2-20210712-a8e5fd2 command: ["milvus", "run", "querycoord"] environment: ETCD_ENDPOINTS: etcd:2379 @@ -77,7 +83,7 @@ services: querynode: container_name: milvus-querynode - image: milvusdb/milvus:v2.0.0-rc1-20210628-b87baa1 + image: milvusdb/milvus:v2.0.0-rc2-20210712-a8e5fd2 command: ["milvus", "run", "querynode"] environment: ETCD_ENDPOINTS: etcd:2379 @@ -88,7 +94,7 @@ services: indexcoord: container_name: milvus-indexcoord - image: milvusdb/milvus:v2.0.0-rc1-20210628-b87baa1 + image: milvusdb/milvus:v2.0.0-rc2-20210712-a8e5fd2 command: ["milvus", "run", "indexcoord"] environment: ETCD_ENDPOINTS: etcd:2379 @@ -102,7 +108,7 @@ services: indexnode: container_name: milvus-indexnode - image: milvusdb/milvus:v2.0.0-rc1-20210628-b87baa1 + image: milvusdb/milvus:v2.0.0-rc2-20210712-a8e5fd2 command: ["milvus", "run", "indexnode"] environment: ETCD_ENDPOINTS: etcd:2379 @@ -114,7 +120,7 @@ services: datacoord: container_name: milvus-datacoord - image: milvusdb/milvus:v2.0.0-rc1-20210628-b87baa1 + image: milvusdb/milvus:v2.0.0-rc2-20210712-a8e5fd2 command: ["milvus", "run", "datacoord"] environment: ETCD_ENDPOINTS: etcd:2379 @@ -128,7 +134,7 @@ services: datanode: container_name: milvus-datanode - image: milvusdb/milvus:v2.0.0-rc1-20210628-b87baa1 + image: milvusdb/milvus:v2.0.0-rc2-20210712-a8e5fd2 command: ["milvus", "run", "datanode"] environment: ETCD_ENDPOINTS: etcd:2379 diff --git a/deployments/docker/standalone/docker-compose.yml b/deployments/docker/standalone/docker-compose.yml index af6c891acb..a71e0cc780 100644 --- a/deployments/docker/standalone/docker-compose.yml +++ b/deployments/docker/standalone/docker-compose.yml @@ -4,7 +4,9 @@ services: etcd: container_name: milvus-etcd image: quay.io/coreos/etcd:latest - command: etcd -listen-peer-urls=http://127.0.0.1:2380 -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 -initial-advertise-peer-urls=http://127.0.0.1:2380 --listen-metrics-urls=http://127.0.0.1:2381 --initial-cluster default=http://127.0.0.1:2380 + volumes: + - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/etcd:/etcd + command: etcd -listen-peer-urls=http://127.0.0.1:2380 -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 -initial-advertise-peer-urls=http://127.0.0.1:2380 --listen-metrics-urls=http://127.0.0.1:2381 --initial-cluster default=http://127.0.0.1:2380 --data-dir /etcd healthcheck: test: ["CMD", "wget", "-q", "--tries=1", "--spider", "http://localhost:2381/health"] interval: 30s @@ -17,6 +19,8 @@ services: environment: MINIO_ACCESS_KEY: minioadmin MINIO_SECRET_KEY: minioadmin + volumes: + - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/minio:/minio_data command: minio server /minio_data healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] @@ -31,6 +35,8 @@ services: environment: ETCD_ENDPOINTS: etcd:2379 MINIO_ADDRESS: minio:9000 + volumes: + - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/milvus:/var/lib/milvus ports: - "19530:19530" depends_on: