From 367330d27a8d1c2fac630d30ff0cd8f46be951b1 Mon Sep 17 00:00:00 2001 From: Yuhong Sun Date: Sat, 8 Jul 2023 15:53:21 -0700 Subject: [PATCH] DAN-165 Option to pull image from hub (#149) --- backend/Dockerfile | 2 +- deployment/README.md | 9 ++++----- deployment/docker_compose/docker-compose.dev.yml | 3 +++ deployment/docker_compose/docker-compose.prod.yml | 3 +++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index ece2915082c..a13fc59ae59 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -14,4 +14,4 @@ COPY ./alembic /app/alembic COPY ./alembic.ini /app/alembic.ini ENV PYTHONPATH /app -CMD ["/bin/sh", "-c", "alembic upgrade head && uvicorn danswer.main:app --host 0.0.0.0 --port 8080"] +CMD ["/bin/sh", "-c", "alembic upgrade head && echo \"Starting Danswer Api Server\" && uvicorn danswer.main:app --host 0.0.0.0 --port 8080"] diff --git a/deployment/README.md b/deployment/README.md index 00ce9074e84..bbd1d3bc48a 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -24,12 +24,11 @@ Docker Compose provides the easiest way to get Danswer up and running. Requirements: Docker and docker compose 1. To run Danswer, navigate to `docker_compose` directory and run the following: - - `docker compose -f docker-compose.dev.yml -p danswer-stack up -d --build` + - `docker compose -f docker-compose.dev.yml -p danswer-stack up -d --pull always --force-recreate` + - or run: `docker compose -f docker-compose.dev.yml -p danswer-stack up -d --build --force-recreate` +to build from source - This will start Web/API servers, Postgres (backend DB), Qdrant (vector DB), and the background indexing job. - - Downloading packages/requirements may take 20+ minutes depending on your internet connection and whether it needs - to install packages for GPU. - - If you want to adjust any environment variables, either use the `-e` flag or the `--env-file` flag when running the `docker compose` command, - + - Downloading images or packages/requirements may take 15+ minutes depending on your internet connection. 2. To shut down the deployment, run: diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 906adb16376..f20a090d033 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -1,6 +1,7 @@ version: '3' services: api_server: + image: danswer/danswer-api-server:latest build: context: ../../backend dockerfile: Dockerfile @@ -21,6 +22,7 @@ services: - local_dynamic_storage:/home/storage - file_connector_tmp_storage:/home/file_connector_storage background: + image: danswer/danswer-background:latest build: context: ../../backend dockerfile: Dockerfile.background @@ -39,6 +41,7 @@ services: - local_dynamic_storage:/home/storage - file_connector_tmp_storage:/home/file_connector_storage web_server: + image: danswer/danswer-web-server:latest build: context: ../../web dockerfile: Dockerfile diff --git a/deployment/docker_compose/docker-compose.prod.yml b/deployment/docker_compose/docker-compose.prod.yml index 4828c247ba5..bdf05bbb660 100644 --- a/deployment/docker_compose/docker-compose.prod.yml +++ b/deployment/docker_compose/docker-compose.prod.yml @@ -1,6 +1,7 @@ version: '3' services: api_server: + image: danswer/danswer-api-server:latest build: context: ../../backend dockerfile: Dockerfile @@ -19,6 +20,7 @@ services: - local_dynamic_storage:/home/storage - file_connector_tmp_storage:/home/file_connector_storage background: + image: danswer/danswer-background:latest build: context: ../../backend dockerfile: Dockerfile.background @@ -36,6 +38,7 @@ services: - local_dynamic_storage:/home/storage - file_connector_tmp_storage:/home/file_connector_storage web_server: + image: danswer/danswer-web-server:latest build: context: ../../web dockerfile: Dockerfile