Enable EE features for no-letsencrypt deployment (#9)

This commit is contained in:
Yuhong Sun 2023-10-26 11:35:23 -07:00 committed by Chris Weaver
parent e9f273d99a
commit 0c295d1de5

View File

@ -1,14 +1,14 @@
version: '3' version: '3'
services: services:
api_server: api_server:
image: danswer/danswer-backend:latest image: danswer/danswer-ee-backend:latest
build: build:
context: ../../backend context: ../../backend
dockerfile: Dockerfile dockerfile: Dockerfile
command: > command: >
/bin/sh -c "alembic upgrade head && /bin/sh -c "alembic upgrade head &&
echo \"Starting Danswer Api Server\" && echo \"Starting Danswer Api Server\" &&
uvicorn danswer.main:app --host 0.0.0.0 --port 8080" uvicorn ee.danswer.main:app --host 0.0.0.0 --port 8080"
depends_on: depends_on:
- relational_db - relational_db
- index - index
@ -17,7 +17,7 @@ services:
env_file: env_file:
- .env - .env
environment: environment:
- AUTH_TYPE=${AUTH_TYPE:-google_oauth} - AUTH_TYPE=${AUTH_TYPE:-oidc}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=index - VESPA_HOST=index
- MODEL_SERVER_HOST=${MODEL_SERVER_HOST:-inference_model_server} - MODEL_SERVER_HOST=${MODEL_SERVER_HOST:-inference_model_server}
@ -31,11 +31,11 @@ services:
background: background:
image: danswer/danswer-backend:latest image: danswer/danswer-ee-backend:latest
build: build:
context: ../../backend context: ../../backend
dockerfile: Dockerfile dockerfile: Dockerfile
command: /usr/bin/supervisord command: /usr/bin/supervisord -c /etc/supervisor/conf.d/ee.supervisord.conf
depends_on: depends_on:
- relational_db - relational_db
- index - index
@ -45,7 +45,7 @@ services:
env_file: env_file:
- .env - .env
environment: environment:
- AUTH_TYPE=${AUTH_TYPE:-google_oauth} - AUTH_TYPE=${AUTH_TYPE:-oidc}
- POSTGRES_HOST=relational_db - POSTGRES_HOST=relational_db
- VESPA_HOST=index - VESPA_HOST=index
- MODEL_SERVER_HOST=${MODEL_SERVER_HOST:-inference_model_server} - MODEL_SERVER_HOST=${MODEL_SERVER_HOST:-inference_model_server}
@ -60,7 +60,7 @@ services:
web_server: web_server:
image: danswer/danswer-web-server:latest image: danswer/danswer-ee-web-server:latest
build: build:
context: ../../web context: ../../web
dockerfile: Dockerfile dockerfile: Dockerfile
@ -70,6 +70,7 @@ services:
- NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS:-} - NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS:-}
- NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS:-} - NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS:-}
- NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT:-} - NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT:-}
- NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED:-true}
depends_on: depends_on:
- api_server - api_server
restart: always restart: always