From da9b9d730eb2a1d671341bb694ca6bdc604f765a Mon Sep 17 00:00:00 2001 From: "Nathan.fooo" <86001920+appflowy@users.noreply.github.com> Date: Mon, 3 Jun 2024 20:01:31 +0800 Subject: [PATCH] chore: fix ai docker compose (#598) --- deploy.env | 1 + dev.env | 1 + docker-compose-ci.yml | 3 +-- docker-compose-dev.yml | 5 +---- docker-compose.yml | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/deploy.env b/deploy.env index ef2f4dbd..0377709b 100644 --- a/deploy.env +++ b/deploy.env @@ -113,6 +113,7 @@ CLOUDFLARE_TUNNEL_TOKEN= # AppFlowy AI APPFLOWY_AI_OPENAI_API_KEY= APPFLOWY_AI_SERVER_PORT=5001 +APPFLOWY_AI_DATABASE_URL=postgresql+psycopg://postgres:password@postgres:5432/postgres # AppFlowy History APPFLOWY_HISTORY_URL=http://history:50051 diff --git a/dev.env b/dev.env index 620076f0..b4caf25e 100644 --- a/dev.env +++ b/dev.env @@ -101,6 +101,7 @@ CLOUDFLARE_TUNNEL_TOKEN= # AppFlowy AI APPFLOWY_AI_OPENAI_API_KEY= APPFLOWY_AI_SERVER_PORT=5001 +APPFLOWY_AI_DATABASE_URL=postgresql+psycopg://postgres:password@postgres:5432/postgres # AppFlowy History APPFLOWY_HISTORY_URL=http://history:50051 diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index fe1256de..26099c57 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -41,7 +41,6 @@ services: - POSTGRES_HOST=${POSTGRES_HOST:-postgres} volumes: - ./migrations/before:/docker-entrypoint-initdb.d - # - postgres_data:/var/lib/postgresql/data redis: restart: on-failure @@ -144,8 +143,8 @@ services: - "5001:5001" environment: - OPENAI_API_KEY=${APPFLOWY_AI_OPENAI_API_KEY} - - APPFLOWY_AI_SERVER_HOST=${APPFLOWY_AI_SERVER_HOST} - APPFLOWY_AI_SERVER_PORT=${APPFLOWY_AI_SERVER_PORT} + - APPFLOWY_AI_DATABASE_URL=${APPFLOWY_AI_DATABASE_URL} appflowy_history: restart: on-failure diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 347a1203..68c98e80 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -119,12 +119,9 @@ services: ports: - 5001:5001 environment: - - VECTOR_STORE_ENABLED=true - OPENAI_API_KEY=${APPFLOWY_AI_OPENAI_API_KEY} - - APPFLOWY_AI_SERVER_HOST=${APPFLOWY_AI_SERVER_HOST} - APPFLOWY_AI_SERVER_PORT=${APPFLOWY_AI_SERVER_PORT} - - APPFLOWY_DATABASE_URL=postgresql+psycopg://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-password}@${POSTGRES_HOST:-postgres}:5432/${POSTGRES_DB:-postgres} - + - APPFLOWY_AI_DATABASE_URL=${APPFLOWY_AI_DATABASE_URL} volumes: postgres_data: diff --git a/docker-compose.yml b/docker-compose.yml index 86e95a94..d7752a03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -142,8 +142,8 @@ services: - "5001:5001" environment: - OPENAI_API_KEY=${APPFLOWY_AI_OPENAI_API_KEY} - - APPFLOWY_AI_SERVER_HOST=${APPFLOWY_AI_SERVER_HOST} - APPFLOWY_AI_SERVER_PORT=${APPFLOWY_AI_SERVER_PORT} + - APPFLOWY_AI_DATABASE_URL=${APPFLOWY_AI_DATABASE_URL} appflowy_history: restart: on-failure