From 90b94e653e243eb06f39918512305a7cd31e0848 Mon Sep 17 00:00:00 2001 From: Bruno Charest Date: Thu, 6 Aug 2026 11:40:18 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20backend=20port=208000=20=E2=86=92?= =?UTF-8?q?=207000=20pour=20eviter=20conflits=20applicatifs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Dockerfile: EXPOSE + CMD uvicorn --port 7000 - app/config.py: PORT default 8000 → 7000 - nginx default.conf: 6x proxy_pass backend:8000 → backend:7000 - docker-compose.prod.yml: BACKEND_PORT default 8001 → 7000, internal 7000 - docker-compose.yml (dev): 8000:8000 → 7000:7000 - imago-admin/docker-compose.yml: VITE_API_BASE_URL + port mapping → 7000 - .env.example: BACKEND_PORT=8001 → 7000 - deploy.sh: defaults + invites port 8001 → 7000 --- Dockerfile | 4 ++-- app/config.py | 2 +- docker-compose/.env.example | 2 +- docker-compose/docker-compose.prod.yml | 2 +- docker-compose/docker-compose.yml | 2 +- imago-admin/docker-compose.yml | 4 ++-- imago-admin/nginx/default.conf | 12 ++++++------ scripts/deploy.sh | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec0ef0b..79d3530 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,6 @@ COPY . . # Répertoires de données RUN mkdir -p data/uploads data/thumbnails -EXPOSE 8000 +EXPOSE 7000 -CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] +CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7000"] diff --git a/app/config.py b/app/config.py index 66e1b6c..6761b3a 100644 --- a/app/config.py +++ b/app/config.py @@ -18,7 +18,7 @@ class Settings(BaseSettings): # Serveur HOST: str = "0.0.0.0" - PORT: int = 8000 + PORT: int = 7000 # Base de données DATABASE_URL: str = "sqlite+aiosqlite:///./data/imago.db" diff --git a/docker-compose/.env.example b/docker-compose/.env.example index 7cecd6d..8fa6c71 100644 --- a/docker-compose/.env.example +++ b/docker-compose/.env.example @@ -13,7 +13,7 @@ SECRET_KEY=changez-moi-par-une-valeur-longue-et-aleatoire # ── Ports (exposés sur l'hôte) ─────────────────────────────── ADMIN_PORT=3001 -BACKEND_PORT=8001 +BACKEND_PORT=7000 # ── Stockage ───────────────────────────────────────────────── # "local" = fichiers sur disque diff --git a/docker-compose/docker-compose.prod.yml b/docker-compose/docker-compose.prod.yml index 3e814bd..b308e79 100644 --- a/docker-compose/docker-compose.prod.yml +++ b/docker-compose/docker-compose.prod.yml @@ -15,7 +15,7 @@ services: image: docker-registry.dev.home:5000/imago-backend:latest user: "1000:1000" ports: - - "${BACKEND_PORT:-8001}:8000" + - "${BACKEND_PORT:-7000}:7000" env_file: - .env environment: diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 26d80ad..fce8e46 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -59,7 +59,7 @@ services: context: .. dockerfile: Dockerfile ports: - - "8000:8000" + - "7000:7000" env_file: - ../.env environment: diff --git a/imago-admin/docker-compose.yml b/imago-admin/docker-compose.yml index 9dad34c..0fe81c5 100644 --- a/imago-admin/docker-compose.yml +++ b/imago-admin/docker-compose.yml @@ -3,7 +3,7 @@ services: build: context: . args: - VITE_API_BASE_URL: http://localhost:8000 + VITE_API_BASE_URL: http://localhost:7000 ports: - '3000:80' depends_on: @@ -14,7 +14,7 @@ services: build: context: .. ports: - - '8000:8000' + - '7000:7000' volumes: - ../data:/app/data env_file: ../.env diff --git a/imago-admin/nginx/default.conf b/imago-admin/nginx/default.conf index 642cc28..bb4c4ef 100644 --- a/imago-admin/nginx/default.conf +++ b/imago-admin/nginx/default.conf @@ -11,7 +11,7 @@ server { # Proxy vers le backend pour les routes API (v1 et Admin) location /api/ { - proxy_pass http://backend:8000; + proxy_pass http://backend:7000; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -20,7 +20,7 @@ server { # Proxy pour les fichiers signés (thumbnails, downloads) location /files/ { - proxy_pass http://backend:8000; + proxy_pass http://backend:7000; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -28,7 +28,7 @@ server { } location /admin/api/ { - proxy_pass http://backend:8000; + proxy_pass http://backend:7000; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -36,18 +36,18 @@ server { } location /ws/ { - proxy_pass http://backend:8000; + proxy_pass http://backend:7000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } location /health { - proxy_pass http://backend:8000; + proxy_pass http://backend:7000; } location /metrics { - proxy_pass http://backend:8000; + proxy_pass http://backend:7000; } # Cache agressif pour les assets buildés (hash dans le nom) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 3791585..b0ae2ae 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -84,7 +84,7 @@ configure_env() { echo -e "${BOLD}── Application ──${NC}" ask "Nom de l'application [Imago]:"; read -r APP_NAME; APP_NAME="${APP_NAME:-Imago}" ask "Port admin UI [3001]:"; read -r ADMIN_PORT; ADMIN_PORT="${ADMIN_PORT:-3001}" - ask "Port API backend [8001]:"; read -r BACKEND_PORT; BACKEND_PORT="${BACKEND_PORT:-8001}" + ask "Port API backend [7000]:"; read -r BACKEND_PORT; BACKEND_PORT="${BACKEND_PORT:-7000}" echo "" # ── Section 2 : Stockage ─────────────────────────────── @@ -409,7 +409,7 @@ show_urls() { done < "$ENV_FILE" fi local admin_port="${ADMIN_PORT:-3001}" - local backend_port="${BACKEND_PORT:-8001}" + local backend_port="${BACKEND_PORT:-7000}" echo "" echo -e "${BOLD}${GREEN}╔══════════════════════════════════════════════════════════════╗${NC}"