Open source video conferencing app powered by LiveKit. Built with Django and React.
♻️(summary) integrate summary Docker compose into global dev tooling
lebaudantoine67b046c9ba3f
diff --git a/Makefile b/Makefileindex 444509b2..905d1a7a 100644--- a/Makefile+++ b/Makefile@@ -71,7 +71,8 @@ create-env-files: \env.d/development/common \env.d/development/crowdin \env.d/development/postgresql \- env.d/development/kc_postgresql+ env.d/development/kc_postgresql \+ env.d/development/summary.PHONY: create-env-filesbootstrap: ## Prepare Docker images for the project@@ -116,9 +117,14 @@ run-backend: ## start only the backend application and all needed services@$(WAIT_DB).PHONY: run-backend+run-summary: ## start only the summary application and all needed services+ @$(COMPOSE) up --force-recreate -d celery-summary+.PHONY: run-summary+run:run: ## start the wsgi (production) and development server@$(MAKE) run-backend+ @$(MAKE) run-summary@$(COMPOSE) up --force-recreate -d frontend.PHONY: run@@ -246,6 +252,9 @@ env.d/development/postgresql:env.d/development/kc_postgresql:cp -n env.d/development/kc_postgresql.dist env.d/development/kc_postgresql+env.d/development/summary:+ cp -n env.d/development/summary.dist env.d/development/summary+# -- Internationalizationenv.d/development/crowdin:diff --git a/compose.yml b/compose.ymlindex 9251a620..c9a795db 100644--- a/compose.yml+++ b/compose.yml@@ -221,3 +221,40 @@ services:- ./docker/livekit/out:/outdepends_on:- redis++ redis-summary:+ image: redis+ ports:+ - "6379:6379"++ app-summary-dev:+ build:+ context: src/summary+ target: development+ args:+ DOCKER_USER: ${DOCKER_USER:-1000}+ user: ${DOCKER_USER:-1000}+ env_file:+ - env.d/development/summary+ ports:+ - "8001:8000"+ volumes:+ - ./src/summary:/app+ depends_on:+ - redis-summary++ celery-summary:+ container_name: celery-summary+ build:+ context: ./src/summary+ dockerfile: Dockerfile+ target: production+ command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug+ env_file:+ - env.d/development/summary+ volumes:+ - ./src/summary:/app+ depends_on:+ - redis-summary+ - app-summary-dev+ - miniodiff --git a/env.d/development/summary.dist b/env.d/development/summary.distnew file mode 100644index 00000000..9575507b--- /dev/null+++ b/env.d/development/summary.dist@@ -0,0 +1,14 @@+APP_NAME="meet-app-summary-dev"+APP_API_TOKEN="dev-apikey"++AWS_STORAGE_BUCKET_NAME="meet-media-storage"+AWS_S3_ENDPOINT_URL="minio:9000"+AWS_S3_SECURE_ACCESS=false++AWS_S3_ACCESS_KEY_ID="meet"+AWS_S3_SECRET_ACCESS_KEY="password"++OPENAI_API_KEY="your-openai-key"++WEBHOOK_API_TOKEN="secret"+WEBHOOK_URL="https://configure-your-url.com"diff --git a/src/summary/compose.yaml b/src/summary/compose.yamldeleted file mode 100644index b8d6995d..00000000--- a/src/summary/compose.yaml+++ /dev/null@@ -1,27 +0,0 @@-services:- redis:- image: redis- ports:- - "6379:6379"- app:- container_name: app- build: .- command: uvicorn summary.main:app --host 0.0.0.0 --port 8000 --reload- volumes:- - .:/app- ports:- - "8000:8000"- restart: always- env_file:- ".env"- depends_on:- - redis- celery_worker:- container_name: celery_worker- build: .- command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug- volumes:- - .:/app- depends_on:- - redis- - app