From 4f554e8b86e54c8b8ed1f81805dab2d608661cd0 Mon Sep 17 00:00:00 2001 From: Luke VanderHart Date: Sat, 3 Dec 2022 20:54:19 -0500 Subject: [PATCH] Use separate docker compose cfg for tests So we don't accidentally delete one we didn't want to when tests are done running. --- bin/integration-test | 4 ++-- docker-compose.test.yml | 51 +++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 6 ++--- 3 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 docker-compose.test.yml diff --git a/bin/integration-test b/bin/integration-test index ded5854..7ae4d2e 100755 --- a/bin/integration-test +++ b/bin/integration-test @@ -3,12 +3,12 @@ set -e function cleanup { - docker-compose down --rmi local --volumes + docker-compose -f docker-compose.test.yml down --rmi local --volumes } trap cleanup EXIT -docker-compose up --build -d +docker-compose -f docker-compose.test.yml up --build -d export CHROMA_INTEGRATION_TEST=1 export CHROMA_API_IMPL=rest diff --git a/docker-compose.test.yml b/docker-compose.test.yml new file mode 100644 index 0000000..36d9a7d --- /dev/null +++ b/docker-compose.test.yml @@ -0,0 +1,51 @@ +version: '3.9' + +networks: + test_net: + driver: bridge + +services: + test_server: + build: + context: . + dockerfile: Dockerfile + volumes: + - ./:/chroma + - test_index_data:/index_data + command: uvicorn chroma.app:app --reload --workers 1 --host 0.0.0.0 --port 8000 + environment: + - CHROMA_DB_IMPL=clickhouse + - CLICKHOUSE_HOST=test_clickhouse + - CLICKHOUSE_PORT=9000 + - CELERY_BROKER_URL=redis://redis:6379/0 + - CELERY_RESULT_BACKEND=redis://redis:6379/0 + ports: + - 8000:8000 + depends_on: + - test_clickhouse + networks: + - test_net + + test_clickhouse: + image: clickhouse/clickhouse-server:22.9-alpine + environment: + - ALLOW_EMPTY_PASSWORD=yes + - CLICKHOUSE_TCP_PORT=9000 + - CLICKHOUSE_HTTP_PORT=8123 + ports: + - '8123:8123' + - '9000:9000' + volumes: + - test_clickhouse_data:/bitnami/clickhouse + - test_backups:/backups + - ./config/backup_disk.xml:/etc/clickhouse-server/config.d/backup_disk.xml + networks: + - test_net + +volumes: + test_clickhouse_data: + driver: local + test_index_data: + driver: local + test_backups: + driver: local diff --git a/docker-compose.yml b/docker-compose.yml index 1ebdac1..196db78 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.9' networks: - chroma-net: + net: driver: bridge services: @@ -24,7 +24,7 @@ services: depends_on: - clickhouse networks: - - chroma-net + - net clickhouse: image: clickhouse/clickhouse-server:22.9-alpine @@ -40,7 +40,7 @@ services: - backups:/backups - ./config/backup_disk.xml:/etc/clickhouse-server/config.d/backup_disk.xml networks: - - chroma-net + - net volumes: clickhouse_data: