Fix Container Name (#633)

This commit is contained in:
Yuhong Sun
2023-10-25 23:22:24 -07:00
committed by GitHub
parent 76275b29d4
commit 7bc34ce182
4 changed files with 20 additions and 17 deletions

View File

@@ -95,9 +95,9 @@ playwright install
#### Dependent Docker Containers #### Dependent Docker Containers
First navigate to `danswer/deployment/docker_compose`, then start up Vespa and Postgres with: First navigate to `danswer/deployment/docker_compose`, then start up Vespa and Postgres with:
```bash ```bash
docker compose -f docker-compose.dev.yml -p danswer-stack up -d document_index relational_db docker compose -f docker-compose.dev.yml -p danswer-stack up -d index relational_db
``` ```
(document_index refers to Vespa and relational_db refers to Postgres) (index refers to Vespa and relational_db refers to Postgres)
#### Running Danswer #### Running Danswer

View File

@@ -11,7 +11,7 @@ services:
uvicorn danswer.main:app --host 0.0.0.0 --port 8080" uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
depends_on: depends_on:
- relational_db - relational_db
- document_index - index
restart: always restart: always
ports: ports:
- "8080:8080" - "8080:8080"
@@ -23,7 +23,7 @@ services:
- GEN_AI_HOST_TYPE=${GEN_AI_HOST_TYPE:-} - GEN_AI_HOST_TYPE=${GEN_AI_HOST_TYPE:-}
- NUM_DOCUMENT_TOKENS_FED_TO_GENERATIVE_MODEL=${NUM_DOCUMENT_TOKENS_FED_TO_GENERATIVE_MODEL:-} - NUM_DOCUMENT_TOKENS_FED_TO_GENERATIVE_MODEL=${NUM_DOCUMENT_TOKENS_FED_TO_GENERATIVE_MODEL:-}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=document_index - VESPA_HOST=index
- AUTH_TYPE=${AUTH_TYPE:-disabled} - AUTH_TYPE=${AUTH_TYPE:-disabled}
- QA_TIMEOUT=${QA_TIMEOUT:-} - QA_TIMEOUT=${QA_TIMEOUT:-}
- VALID_EMAIL_DOMAINS=${VALID_EMAIL_DOMAINS:-} - VALID_EMAIL_DOMAINS=${VALID_EMAIL_DOMAINS:-}
@@ -60,7 +60,7 @@ services:
command: /usr/bin/supervisord command: /usr/bin/supervisord
depends_on: depends_on:
- relational_db - relational_db
- document_index - index
restart: always restart: always
environment: environment:
- INTERNAL_MODEL_VERSION=${INTERNAL_MODEL_VERSION:-openai-chat-completion} - INTERNAL_MODEL_VERSION=${INTERNAL_MODEL_VERSION:-openai-chat-completion}
@@ -69,7 +69,7 @@ services:
- GEN_AI_ENDPOINT=${GEN_AI_ENDPOINT:-} - GEN_AI_ENDPOINT=${GEN_AI_ENDPOINT:-}
- GEN_AI_HOST_TYPE=${GEN_AI_HOST_TYPE:-} - GEN_AI_HOST_TYPE=${GEN_AI_HOST_TYPE:-}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=document_index - VESPA_HOST=index
- API_BASE_OPENAI=${API_BASE_OPENAI:-} - API_BASE_OPENAI=${API_BASE_OPENAI:-}
- API_TYPE_OPENAI=${API_TYPE_OPENAI:-} - API_TYPE_OPENAI=${API_TYPE_OPENAI:-}
- API_VERSION_OPENAI=${API_VERSION_OPENAI:-} - API_VERSION_OPENAI=${API_VERSION_OPENAI:-}
@@ -129,7 +129,8 @@ services:
- "5432:5432" - "5432:5432"
volumes: volumes:
- db_volume:/var/lib/postgresql/data - db_volume:/var/lib/postgresql/data
document_index: # This container name cannot have an underscore in it due to Vespa expectations of the URL
index:
image: vespaengine/vespa:8 image: vespaengine/vespa:8
restart: always restart: always
ports: ports:

View File

@@ -11,14 +11,14 @@ services:
uvicorn danswer.main:app --host 0.0.0.0 --port 8080" uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
depends_on: depends_on:
- relational_db - relational_db
- document_index - index
restart: always restart: always
env_file: env_file:
- .env - .env
environment: environment:
- AUTH_TYPE=${AUTH_TYPE:-google_oauth} - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=document_index - VESPA_HOST=index
volumes: volumes:
- local_dynamic_storage:/home/storage - local_dynamic_storage:/home/storage
- file_connector_tmp_storage:/home/file_connector_storage - file_connector_tmp_storage:/home/file_connector_storage
@@ -33,14 +33,14 @@ services:
command: /usr/bin/supervisord command: /usr/bin/supervisord
depends_on: depends_on:
- relational_db - relational_db
- document_index - index
restart: always restart: always
env_file: env_file:
- .env - .env
environment: environment:
- AUTH_TYPE=${AUTH_TYPE:-google_oauth} - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=document_index - VESPA_HOST=index
volumes: volumes:
- local_dynamic_storage:/home/storage - local_dynamic_storage:/home/storage
- file_connector_tmp_storage:/home/file_connector_storage - file_connector_tmp_storage:/home/file_connector_storage
@@ -69,7 +69,8 @@ services:
- .env - .env
volumes: volumes:
- db_volume:/var/lib/postgresql/data - db_volume:/var/lib/postgresql/data
document_index: # This container name cannot have an underscore in it due to Vespa expectations of the URL
index:
image: vespaengine/vespa:8 image: vespaengine/vespa:8
restart: always restart: always
ports: ports:

View File

@@ -11,14 +11,14 @@ services:
uvicorn danswer.main:app --host 0.0.0.0 --port 8080" uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
depends_on: depends_on:
- relational_db - relational_db
- document_index - index
restart: always restart: always
env_file: env_file:
- .env - .env
environment: environment:
- AUTH_TYPE=${AUTH_TYPE:-google_oauth} - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=document_index - VESPA_HOST=index
volumes: volumes:
- local_dynamic_storage:/home/storage - local_dynamic_storage:/home/storage
- file_connector_tmp_storage:/home/file_connector_storage - file_connector_tmp_storage:/home/file_connector_storage
@@ -33,14 +33,14 @@ services:
command: /usr/bin/supervisord command: /usr/bin/supervisord
depends_on: depends_on:
- relational_db - relational_db
- document_index - index
restart: always restart: always
env_file: env_file:
- .env - .env
environment: environment:
- AUTH_TYPE=${AUTH_TYPE:-google_oauth} - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=document_index - VESPA_HOST=index
volumes: volumes:
- local_dynamic_storage:/home/storage - local_dynamic_storage:/home/storage
- file_connector_tmp_storage:/home/file_connector_storage - file_connector_tmp_storage:/home/file_connector_storage
@@ -69,7 +69,8 @@ services:
- .env - .env
volumes: volumes:
- db_volume:/var/lib/postgresql/data - db_volume:/var/lib/postgresql/data
document_index: # This container name cannot have an underscore in it due to Vespa expectations of the URL
index:
image: vespaengine/vespa:8 image: vespaengine/vespa:8
restart: always restart: always
ports: ports: