Use local override

Author: kosyachniy

.gitignore

@@ -4,6 +4,3 @@
 __pycache__/
 *.py[cod]
 .venv/
-/compose.local.yml
-/docker-compose.override.yml
-/compose.override.yml

Makefile

@@ -1,21 +1,66 @@
-# Makefile at repo-root
+SHELL := /usr/bin/env bash
+.ONESHELL:
+.DEFAULT_GOAL := help
+
+# ==== Paths ====
+COMPOSE_BASE := infra/compose/compose.yml
+COMPOSE_LOCAL := infra/compose/compose.local.yml
+COMPOSE_DEV := infra/compose/stack.dev.yml
+COMPOSE_PROD := infra/compose/stack.prod.yml
+TRAEFIK_STACK := infra/compose/stack.traefik.yml
+
+# ==== Envs ====
+ENV_FILE ?= .env
+
+# ==== Helpers ====
+define source_env
+set -euo pipefail; \
+if [[ -f $(1) ]]; then \
+  set -a; source $(1); set +a; \
+else \
+  echo "ENV file $(1) not found"; exit 1; \
+fi
+endef
+
+# ==== Help ====
+help: ## Показать цели Makefile
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## ' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[36m%-18s\033[0m %s\n", $$1, $$2}'
 
 # Export all variables from .env file
 ifneq (,$(wildcard ./.env))
     include .env
     export
 endif
 
-up:        ## Запустить весь стек (production mode - stable)
-	docker-compose --env-file .env -f infra/compose/compose.yml up -d
+# ==== Commands ====
 
-up-dev:    ## Запустить весь стек (dev mode with volume mounts)
+up:
 	docker compose \
-		-f infra/compose/compose.yml \
-		-f infra/compose/compose.dev.yml \
-		-f compose.local.yml \
+		--env-file $(ENV_FILE) \
+		-f $(COMPOSE_BASE) \
+		-f $(COMPOSE_PROD) \
 		up -d
 
+up-dev:
+	docker compose \
+		--env-file $(ENV_FILE) \
+		-f $(COMPOSE_BASE) \
+		-f $(COMPOSE_DEV) \
+		up -d
+
+up-local:
+	docker compose \
+		--env-file $(ENV_FILE) \
+		-f $(COMPOSE_BASE) \
+		-f $(COMPOSE_LOCAL) \
+		up -d
+
+deploy-dev:
+	. $(ENV_FILE); docker stack deploy \
+		-c $(COMPOSE_BASE) \
+		-c $(COMPOSE_DEV) \
+	  	--with-registry-auth app-dev
+
 build:     ## Пересобрать контейнеры (production)
 	docker-compose --env-file .env -f infra/compose/compose.yml build
 

compose.local.yml

@@ -0,0 +1,92 @@
+volumes:
+  mongo_data: {}
+  pgdata: {}
+  redis_data: {}
+  app_data: {}
+  logs_data: {}
+  node_modules_cache: {}
+
+services:
+  api:
+    build:
+      context: ../backend
+    command: [ "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload" ]
+    env_file: ../../.env
+    volumes:
+      - ../backend:/app
+    ports:
+      - "8000:8000"
+    depends_on:
+      - mongo
+      - postgres
+      - redis
+
+  worker:
+    build:
+      context: ../backend
+    command: [ "celery", "-A", "app.tasks.celery_app", "worker", "--concurrency=2", "--loglevel=INFO" ]
+    env_file: ../../.env
+    volumes:
+      - ../backend:/app
+    depends_on:
+      - mongo
+      - postgres
+      - redis
+
+  frontend:
+    build:
+      context: ../frontend
+    command: [ "npm", "run", "dev" ]
+    environment:
+      ENV: local
+      NEXT_PUBLIC_API_URL: ${API_URL}
+      SENTRY_DSN:
+    volumes:
+      - ../frontend:/app
+    ports:
+      - "3000:3000"
+    depends_on:
+      - api
+
+  mongo:
+    image: mongo:8.0
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER}
+      MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASS}
+      MONGO_INITDB_DATABASE: ${MONGO_DB}
+    volumes:
+      - mongo_data:/data/db
+    networks: [ app-net ]
+    ports:
+      - "27017:27017"
+
+  postgres:
+    image: postgres:17.5
+    environment:
+      POSTGRES_USER: ${PG_USER}
+      POSTGRES_PASSWORD: ${PG_PASS}
+      POSTGRES_DB: ${PG_DB}
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    networks: [ app-net ]
+    ports:
+      - "5432:5432"
+    # healthcheck:
+    #   test: [ "CMD-SHELL", "pg_isready -U user -d app" ]
+    #   interval: 5s
+    #   timeout: 5s
+    #   retries: 10
+
+  redis:
+    image: redis:8.2-alpine
+    command: [ "redis-server", "--appendonly", "no" ]
+    volumes:
+      - redis_data:/data
+    networks: [ app-net ]
+    ports:
+      - "6379:6379"
+    # healthcheck:
+    #   test: [ "CMD", "redis-cli", "-a", "redispass", "ping" ]
+    #   interval: 5s
+    #   timeout: 3s
+    #   retries: 10

infra/compose/compose.local.yml

@@ -1,51 +1,48 @@
+networks:
+  app-net: {}
+
 services:
-  backend:
-    build:
-      context: ../../backend
-    env_file: .env
-    volumes:
-      - app_data:/app/data
-      - logs_data:/app/logs
-    ports:
-      - "8000:8000"
-    depends_on:
-      - mongo
-      - redis
+  api:
+    image: ${REGISTRY:-local}/${PROJECT_SLUG:-app}/api:${TAG:-local}
+    env_file: ../../.env
+    networks: [ app-net ]
+    expose: [ "8000" ]
+    deploy:
+      restart_policy: { condition: on-failure }
 
-  frontend:
-    build:
-      context: ../../frontend
-    env_file: .env
-    environment:
-      - NEXT_PUBLIC_API_URL=http://localhost:8000/v1
-    volumes:
-      - node_modules_cache:/app/node_modules
-    ports:
-      - "3000:3000"
-    depends_on:
-      - backend
+  worker:
+    image: ${REGISTRY:-local}/${PROJECT_SLUG:-app}/api:${TAG:-local}
+    command: [ "celery", "-A", "app.tasks.celery_app", "worker", "-Q", "high,default,low", "--concurrency=4", "--loglevel=INFO", "-O", "fair" ]
+    env_file: ../../.env
+    networks: [ app-net ]
+    deploy:
+      restart_policy: { condition: on-failure }
+      replicas: 2
 
-  mongo:
-    image: mongo:8.0
-    volumes:
-      - mongo_data:/data/db
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=${MONGO_USER}
-      - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASS}
-      - MONGO_INITDB_DATABASE=${MONGO_DBNAME}
-    ports:
-      - "27017:27017"
+  scheduler:
+    image: ${REGISTRY:-local}/${PROJECT_SLUG:-app}/api:${TAG:-local}
+    command: [ "celery", "-A", "app.tasks.celery_app", "beat", "--scheduler", "redbeat.RedBeatScheduler" ]
+    env_file: ../../.env
+    networks: [ app-net ]
+    deploy:
+      restart_policy: { condition: on-failure }
 
-  redis:
-    image: redis:8.2
-    volumes:
-      - redis_data:/data
-    ports:
-      - "6379:6379"
+  # daemon:
+  #   image: ${REGISTRY:-local}/${PROJECT_SLUG:-app}/api:${TAG:-local}
+  #   command: [ "python", "-m", "app.services.realtime_poller" ]
+  #   env_file: ../../.env
+  #   networks: [ app-net ]
+  #   deploy:
+  #     restart_policy: { condition: on-failure }
+  #     replicas: 1
 
-volumes:
-  mongo_data:
-  redis_data:
-  app_data:
-  logs_data:
-  node_modules_cache:
+  frontend:
+    image: ${REGISTRY:-local}/${PROJECT_SLUG:-app}/web:${TAG:-local}
+    environment:
+      ENV: ${ENV}
+      NEXT_PUBLIC_API_URL: ${API_URL}
+      SENTRY_DSN: ${SENTRY_DSN_FRONT:-}
+    networks: [ app-net ]
+    expose: [ "3000" ]
+    deploy:
+      restart_policy: { condition: on-failure }