From 67b046c9ba3f457cfa346b5951dd04c47a72bcbd Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Tue, 9 Sep 2025 12:32:30 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F(summary)=20integrate=20summa?= =?UTF-8?q?ry=20Docker=20compose=20into=20global=20dev=20tooling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate summary service into main development stack to centralize development environment management and simplify service orchestration with shared infrastructure like MinIO storage. --- Makefile | 11 +++++++++- compose.yml | 37 ++++++++++++++++++++++++++++++++++ env.d/development/summary.dist | 14 +++++++++++++ src/summary/compose.yaml | 27 ------------------------- 4 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 env.d/development/summary.dist delete mode 100644 src/summary/compose.yaml diff --git a/Makefile b/Makefile index 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-files bootstrap: ## 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 + # -- Internationalization env.d/development/crowdin: diff --git a/compose.yml b/compose.yml index 9251a620..c9a795db 100644 --- a/compose.yml +++ b/compose.yml @@ -221,3 +221,40 @@ services: - ./docker/livekit/out:/out depends_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 + - minio diff --git a/env.d/development/summary.dist b/env.d/development/summary.dist new file mode 100644 index 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.yaml deleted file mode 100644 index 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