fix(conductor): support multi-instance deployment with external services (#79)

Create a dedicated docker-compose.conductor.yml for Conductor that only runs
frontend and backend services, using external Redis and PostgreSQL. Remove
static container names to avoid conflicts between instances, and move port
definitions to docker-compose.override.yml for dynamic port allocation.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Clément VALENTIN <[email protected]>
Co-authored-by: Claude <[email protected]>

Author: 3 people

docker-compose.conductor.yml

@@ -0,0 +1,56 @@
+# Docker Compose pour Conductor (multi-instances)
+# Utilise Redis et PostgreSQL externes configurés via .env.local
+# Les ports sont définis dynamiquement dans docker-compose.override.yml
+
+services:
+
+  # Backend FastAPI
+  backend:
+    build:
+      context: ./apps/api
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    env_file:
+      - ./.env.api
+    environment:
+      - PYTHONUNBUFFERED=1
+      - WATCHFILES_FORCE_POLLING=true
+      - WATCHFILES_POLL_INTERVAL=1000
+      - TZ=Europe/Paris
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    volumes:
+      - ./apps/api/data:/app/data
+      - ./apps/api/src:/app/src
+      - ./apps/api/static:/app/static
+      - backend_logs:/logs
+    command: ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload", "--reload-dir", "/app/src"]
+    healthcheck:
+      test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/ping')"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+
+  # Frontend React/Vite
+  frontend:
+    build:
+      context: ./apps/web
+      dockerfile: Dockerfile.dev
+    restart: unless-stopped
+    volumes:
+      - ./apps/web/src:/app/src
+      - ./apps/web/public:/app/public
+      - ./apps/web/index.html:/app/index.html
+      - ./apps/web/vite.config.ts:/app/vite.config.ts
+      - ./apps/web/tsconfig.json:/app/tsconfig.json
+      - ./apps/web/tsconfig.node.json:/app/tsconfig.node.json
+      - ./apps/web/tailwind.config.js:/app/tailwind.config.js
+      - ./apps/web/postcss.config.js:/app/postcss.config.js
+      - /app/node_modules
+    depends_on:
+      - backend
+
+volumes:
+  backend_logs:
+    driver: local

docker-compose.yml

@@ -3,7 +3,6 @@ services:
   # Redis
   redis:
     image: redis:7-alpine
-    container_name: myelectricaldata-redis
     restart: unless-stopped
     command: redis-server --maxmemory 256mb --maxmemory-policy allkeys-lru
     volumes:
@@ -16,13 +15,10 @@ services:
       timeout: 5s
       retries: 3
 
-  # PostgreSQL (optionnel, activable via DATABASE_TYPE=postgresql)
+  # PostgreSQL
   postgres:
     image: postgres:16-alpine
-    container_name: myelectricaldata-postgres
     restart: unless-stopped
-    env_file :
-      - ./.env.api
     environment:
       POSTGRES_DB: myelectricaldata
       POSTGRES_USER: myelectricaldata
@@ -40,7 +36,6 @@ services:
   # pgAdmin - Interface web PostgreSQL
   pgadmin:
     image: dpage/pgadmin4:latest
-    container_name: myelectricaldata-pgadmin
     restart: unless-stopped
     environment:
       PGADMIN_DEFAULT_EMAIL: [email protected]
@@ -61,7 +56,6 @@ services:
     build:
       context: ./apps/api
       dockerfile: Dockerfile
-    container_name: myelectricaldata-backend
     restart: unless-stopped
     env_file:
       - ./.env.api
@@ -70,6 +64,8 @@ services:
       - WATCHFILES_FORCE_POLLING=true
       - WATCHFILES_POLL_INTERVAL=1000
       - TZ=Europe/Paris
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
       - ./apps/api/data:/app/data
       - ./apps/api/src:/app/src
@@ -80,8 +76,7 @@ services:
       - myelectricaldata
     depends_on:
       - redis
-    ports:
-      - "8081:8000"
+    # ports définis dans docker-compose.override.yml pour support multi-instances
     healthcheck:
       test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/ping')"]
       interval: 30s
@@ -94,7 +89,6 @@ services:
     build:
       context: ./apps/web
       dockerfile: Dockerfile.dev
-    container_name: myelectricaldata-frontend
     restart: unless-stopped
     volumes:
       - ./apps/web/src:/app/src
@@ -106,8 +100,7 @@ services:
       - ./apps/web/tailwind.config.js:/app/tailwind.config.js
       - ./apps/web/postcss.config.js:/app/postcss.config.js
       - /app/node_modules
-    ports:
-      - "8000:5173"
+    # ports définis dans docker-compose.override.yml pour support multi-instances
     networks:
       - myelectricaldata
     depends_on:
@@ -118,7 +111,6 @@ services:
     build:
       context: ./apps/docs
       dockerfile: Dockerfile
-    container_name: myelectricaldata-docs
     restart: unless-stopped
     volumes:
       - ./docs:/app/docs:ro
@@ -130,10 +122,6 @@ services:
       - docs
 
 volumes:
-  caddy_data:
-    driver: local
-  caddy_config:
-    driver: local
   redis_data:
     driver: local
   postgres_data:

scripts/conductor-start.sh

@@ -63,12 +63,19 @@ export BACKEND_PORT
 log_info "Port Frontend: $FRONTEND_PORT"
 log_info "Port Backend: $BACKEND_PORT"
 
-# Vérifier la configuration Redis/PostgreSQL
+# Vérifier la configuration Redis/PostgreSQL (services externes)
+# Remplacer localhost par host.docker.internal pour l'accès depuis les conteneurs
 REDIS_URL="${REDIS_URL:-redis://localhost:6379/0}"
 DATABASE_URL="${DATABASE_URL:-sqlite+aiosqlite:///./data/myelectricaldata.db}"
 
-log_info "Redis: $REDIS_URL"
-log_info "Database: $(echo $DATABASE_URL | sed 's/:.*@/:***@/')"
+# Convertir les URLs pour Docker (localhost -> host.docker.internal)
+REDIS_URL_DOCKER=$(echo "$REDIS_URL" | sed 's/localhost/host.docker.internal/g')
+DATABASE_URL_DOCKER=$(echo "$DATABASE_URL" | sed 's/localhost/host.docker.internal/g')
+
+log_info "Redis (host): $REDIS_URL"
+log_info "Redis (docker): $REDIS_URL_DOCKER"
+log_info "Database (host): $(echo $DATABASE_URL | sed 's/:.*@/:***@/')"
+log_info "Database (docker): $(echo $DATABASE_URL_DOCKER | sed 's/:.*@/:***@/')"
 
 # Créer le fichier .env.api à partir du template si nécessaire
 if [ ! -f ".env.api" ]; then
@@ -78,20 +85,20 @@ if [ ! -f ".env.api" ]; then
     fi
 fi
 
-# Mettre à jour les URLs dans .env.api
+# Mettre à jour les URLs dans .env.api (utiliser les URLs Docker)
 if [ -f ".env.api" ]; then
-    # Mettre à jour REDIS_URL
+    # Mettre à jour REDIS_URL (version Docker)
     if grep -q "^REDIS_URL=" .env.api; then
-        sed -i.bak "s|^REDIS_URL=.*|REDIS_URL=$REDIS_URL|" .env.api
+        sed -i.bak "s|^REDIS_URL=.*|REDIS_URL=$REDIS_URL_DOCKER|" .env.api
     else
-        echo "REDIS_URL=$REDIS_URL" >> .env.api
+        echo "REDIS_URL=$REDIS_URL_DOCKER" >> .env.api
     fi
 
-    # Mettre à jour DATABASE_URL
+    # Mettre à jour DATABASE_URL (version Docker)
     if grep -q "^DATABASE_URL=" .env.api; then
-        sed -i.bak "s|^DATABASE_URL=.*|DATABASE_URL=$DATABASE_URL|" .env.api
+        sed -i.bak "s|^DATABASE_URL=.*|DATABASE_URL=$DATABASE_URL_DOCKER|" .env.api
     else
-        echo "DATABASE_URL=$DATABASE_URL" >> .env.api
+        echo "DATABASE_URL=$DATABASE_URL_DOCKER" >> .env.api
     fi
 
     # Mettre à jour FRONTEND_URL et BACKEND_URL pour le dev
@@ -108,17 +115,20 @@ VITE_APP_NAME=MyElectricalData
 EOF
 
 # Générer le docker-compose.override.yml avec les ports dynamiques
+# et sans dépendances vers redis/postgres (services externes)
 cat > docker-compose.override.yml <<EOF
 # Fichier généré automatiquement par conductor-start.sh
 # Ne pas éditer manuellement - les modifications seront écrasées
+# Mode Conductor: utilise Redis/PostgreSQL externes
 
 services:
   backend:
+    depends_on: []
     ports:
       - "${BACKEND_PORT}:8000"
     environment:
-      - REDIS_URL=${REDIS_URL}
-      - DATABASE_URL=${DATABASE_URL}
+      - REDIS_URL=${REDIS_URL_DOCKER}
+      - DATABASE_URL=${DATABASE_URL_DOCKER}
       - FRONTEND_URL=http://localhost:${FRONTEND_PORT}
       - BACKEND_URL=http://localhost:${BACKEND_PORT}
 
@@ -138,8 +148,9 @@ EOF
 
 log_info "Démarrage des services..."
 
-# Démarrer uniquement frontend et backend (sans redis, postgres, pgadmin, docs)
-docker compose up -d --build frontend backend
+# Utiliser docker-compose.conductor.yml (sans redis, postgres, pgadmin, docs)
+# + docker-compose.override.yml pour les ports dynamiques
+docker compose -f docker-compose.conductor.yml -f docker-compose.override.yml up -d --build
 
 # Attendre que les services soient prêts
 log_info "Attente du démarrage des services..."

scripts/conductor-stop.sh

@@ -32,8 +32,8 @@ fi
 
 log_info "Arrêt des services pour: $COMPOSE_PROJECT_NAME"
 
-# Arrêter les conteneurs
-docker compose down
+# Arrêter les conteneurs (utiliser docker-compose.conductor.yml + override)
+docker compose -f docker-compose.conductor.yml -f docker-compose.override.yml down 2>/dev/null || docker compose -f docker-compose.conductor.yml down
 
 # Nettoyer les fichiers temporaires
 rm -f .conductor-ports