From e7f6010ef6b21580f1ac65710e8bb47554344b17 Mon Sep 17 00:00:00 2001 From: phact Date: Tue, 19 Aug 2025 12:07:11 -0400 Subject: [PATCH] docker-compose improvements --- docker-compose-cpu.yml | 36 ++++++++++++++++++++++++++++-------- docker-compose.yml | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/docker-compose-cpu.yml b/docker-compose-cpu.yml index 49d369c9..df7e7778 100644 --- a/docker-compose-cpu.yml +++ b/docker-compose-cpu.yml @@ -58,12 +58,14 @@ services: - NVIDIA_VISIBLE_DEVICES=all - GOOGLE_OAUTH_CLIENT_ID=${GOOGLE_OAUTH_CLIENT_ID} - GOOGLE_OAUTH_CLIENT_SECRET=${GOOGLE_OAUTH_CLIENT_SECRET} + - MICROSOFT_GRAPH_OAUTH_CLIENT_ID=${MICROSOFT_GRAPH_OAUTH_CLIENT_ID} + - MICROSOFT_GRAPH_OAUTH_CLIENT_SECRET=${MICROSOFT_GRAPH_OAUTH_CLIENT_SECRET} + - WEBHOOK_BASE_URL=${WEBHOOK_BASE_URL} + - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} + - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} volumes: - - ./src:/app/src - - ./pyproject.toml:/app/pyproject.toml - - ./uv.lock:/app/uv.lock - - ./documents:/app/documents - - ./keys:/app/keys + - documents_vol:/app/documents + - keys_vol:/app/keys platform: linux/amd64 openrag-frontend: @@ -78,12 +80,10 @@ services: - OPENRAG_BACKEND_HOST=openrag-backend ports: - "3000:3000" - volumes: - - ./frontend/src:/app/src langflow: volumes: - - ./flows:/app/flows + - flows_vol:/app/flows image: phact/langflow:responses container_name: langflow ports: @@ -96,3 +96,23 @@ services: - OPENRAG-QUERY-FILTER="{}" - LANGFLOW_VARIABLES_TO_GET_FROM_ENVIRONMENT=JWT,OPENRAG-QUERY-FILTER - LANGFLOW_LOG_LEVEL=DEBUG + +volumes: + documents_vol: + driver: local + driver_opts: + type: none + o: bind + device: ./documents + keys_vol: + driver: local + driver_opts: + type: none + o: bind + device: ./keys + flows_vol: + driver: local + driver_opts: + type: none + o: bind + device: ./flows diff --git a/docker-compose.yml b/docker-compose.yml index d3d942ad..80054f2e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,12 +58,14 @@ services: - NVIDIA_VISIBLE_DEVICES=all - GOOGLE_OAUTH_CLIENT_ID=${GOOGLE_OAUTH_CLIENT_ID} - GOOGLE_OAUTH_CLIENT_SECRET=${GOOGLE_OAUTH_CLIENT_SECRET} + - MICROSOFT_GRAPH_OAUTH_CLIENT_ID=${MICROSOFT_GRAPH_OAUTH_CLIENT_ID} + - MICROSOFT_GRAPH_OAUTH_CLIENT_SECRET=${MICROSOFT_GRAPH_OAUTH_CLIENT_SECRET} + - WEBHOOK_BASE_URL=${WEBHOOK_BASE_URL} + - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} + - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} volumes: - - ./src:/app/src - - ./pyproject.toml:/app/pyproject.toml - - ./uv.lock:/app/uv.lock - - ./documents:/app/documents - - ./keys:/app/keys + - documents_vol:/app/documents + - keys_vol:/app/keys gpus: all platform: linux/amd64 @@ -79,12 +81,10 @@ services: - OPENRAG_BACKEND_HOST=openrag-backend ports: - "3000:3000" - volumes: - - ./frontend/src:/app/src langflow: volumes: - - ./flows:/app/flows + - flows_vol:/app/flows image: phact/langflow:responses container_name: langflow ports: @@ -97,3 +97,23 @@ services: - OPENRAG-QUERY-FILTER="{}" - LANGFLOW_VARIABLES_TO_GET_FROM_ENVIRONMENT=JWT,OPENRAG-QUERY-FILTER - LANGFLOW_LOG_LEVEL=DEBUG + +volumes: + documents_vol: + driver: local + driver_opts: + type: none + o: bind + device: ./documents + keys_vol: + driver: local + driver_opts: + type: none + o: bind + device: ./keys + flows_vol: + driver: local + driver_opts: + type: none + o: bind + device: ./flows