From 7bc34ce1823e02f97a73607a852c58c03cd0b119 Mon Sep 17 00:00:00 2001
From: Yuhong Sun <yuhongsun96@gmail.com>
Date: Wed, 25 Oct 2023 23:22:24 -0700
Subject: [PATCH] Fix Container Name (#633)

---
 CONTRIBUTING.md                                       |  4 ++--
 deployment/docker_compose/docker-compose.dev.yml      | 11 ++++++-----
 .../docker-compose.prod-no-letsencrypt.yml            | 11 ++++++-----
 deployment/docker_compose/docker-compose.prod.yml     | 11 ++++++-----
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2505a6665..89d4b897e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -95,9 +95,9 @@ playwright install
 #### Dependent Docker Containers
 First navigate to `danswer/deployment/docker_compose`, then start up Vespa and Postgres with:
 ```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
 
diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml
index 0fdcb8b46..ec1c3669f 100644
--- a/deployment/docker_compose/docker-compose.dev.yml
+++ b/deployment/docker_compose/docker-compose.dev.yml
@@ -11,7 +11,7 @@ services:
       uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
     depends_on:
       - relational_db
-      - document_index
+      - index
     restart: always
     ports:
       - "8080:8080"
@@ -23,7 +23,7 @@ services:
       - GEN_AI_HOST_TYPE=${GEN_AI_HOST_TYPE:-}
       - NUM_DOCUMENT_TOKENS_FED_TO_GENERATIVE_MODEL=${NUM_DOCUMENT_TOKENS_FED_TO_GENERATIVE_MODEL:-}
       - POSTGRES_HOST=relational_db
-      - VESPA_HOST=document_index
+      - VESPA_HOST=index
       - AUTH_TYPE=${AUTH_TYPE:-disabled}
       - QA_TIMEOUT=${QA_TIMEOUT:-}
       - VALID_EMAIL_DOMAINS=${VALID_EMAIL_DOMAINS:-}
@@ -60,7 +60,7 @@ services:
     command: /usr/bin/supervisord
     depends_on:
       - relational_db
-      - document_index
+      - index
     restart: always
     environment:
       - INTERNAL_MODEL_VERSION=${INTERNAL_MODEL_VERSION:-openai-chat-completion}
@@ -69,7 +69,7 @@ services:
       - GEN_AI_ENDPOINT=${GEN_AI_ENDPOINT:-}
       - GEN_AI_HOST_TYPE=${GEN_AI_HOST_TYPE:-}
       - POSTGRES_HOST=relational_db
-      - VESPA_HOST=document_index
+      - VESPA_HOST=index
       - API_BASE_OPENAI=${API_BASE_OPENAI:-}
       - API_TYPE_OPENAI=${API_TYPE_OPENAI:-}
       - API_VERSION_OPENAI=${API_VERSION_OPENAI:-}
@@ -129,7 +129,8 @@ services:
       - "5432:5432"
     volumes:
       - 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
     restart: always
     ports:
diff --git a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
index 44f454b31..b8ad08de8 100644
--- a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
+++ b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
@@ -11,14 +11,14 @@ services:
       uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
     depends_on:
       - relational_db
-      - document_index
+      - index
     restart: always
     env_file:
       - .env
     environment:
       - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
       - POSTGRES_HOST=relational_db
-      - VESPA_HOST=document_index
+      - VESPA_HOST=index
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
@@ -33,14 +33,14 @@ services:
     command: /usr/bin/supervisord
     depends_on:
       - relational_db
-      - document_index
+      - index
     restart: always
     env_file:
       - .env
     environment:
       - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
       - POSTGRES_HOST=relational_db
-      - VESPA_HOST=document_index
+      - VESPA_HOST=index
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
@@ -69,7 +69,8 @@ services:
       - .env
     volumes:
       - 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
     restart: always
     ports:
diff --git a/deployment/docker_compose/docker-compose.prod.yml b/deployment/docker_compose/docker-compose.prod.yml
index 5a5ee8122..92d02a714 100644
--- a/deployment/docker_compose/docker-compose.prod.yml
+++ b/deployment/docker_compose/docker-compose.prod.yml
@@ -11,14 +11,14 @@ services:
       uvicorn danswer.main:app --host 0.0.0.0 --port 8080"
     depends_on:
       - relational_db
-      - document_index
+      - index
     restart: always
     env_file:
       - .env
     environment:
       - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
       - POSTGRES_HOST=relational_db
-      - VESPA_HOST=document_index
+      - VESPA_HOST=index
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
@@ -33,14 +33,14 @@ services:
     command: /usr/bin/supervisord
     depends_on:
       - relational_db
-      - document_index
+      - index
     restart: always
     env_file:
       - .env
     environment:
       - AUTH_TYPE=${AUTH_TYPE:-google_oauth}
       - POSTGRES_HOST=relational_db
-      - VESPA_HOST=document_index
+      - VESPA_HOST=index
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
@@ -69,7 +69,8 @@ services:
       - .env
     volumes:
       - 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
     restart: always
     ports: