From 405ec8a300d501758aed4540ae33e97afae2c090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9rald=20Colangelo?= <gerald.colangelo@weblib.eu>
Date: Thu, 2 Apr 2026 11:41:09 +0200
Subject: [PATCH] Adapt docker-compose and nginx.conf for deployment on infra

---
 .env                |  1 +
 docker-compose.yml  | 31 ++++++++++++++++++++++++-------
 frontend/nginx.conf |  4 ++--
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index 6148558..1635701 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,7 @@
 SECRET_KEY=tYmcw4icw9qlVU2wToq3Szpli6TLhKqsHFCh616oY3ZnbmUbKh1ehjZzcZZwtHKqcgE
 DEBUG=True
 ALLOWED_HOSTS=localhost,127.0.0.1,web
+NETWORK=shooter-hub_default
 
 DATABASE_URL=postgresql://shooter:shooter_secret@db:5432/shooter_hub
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 4a45451..7881767 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,12 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
+    networks:
+      local_net:
+        aliases:
+          - ${COMPOSE_PROJECT_NAME}-db
 
-  web:
+  app:
     build: .
     command: >
       sh -c "python manage.py migrate --noinput &&
@@ -23,23 +27,36 @@ services:
              python manage.py runserver 0.0.0.0:8000"
     volumes:
       - .:/app
-    ports:
-      - "8000:8000"
+        #ports:
+        #- "8000:8000"
     depends_on:
       db:
         condition: service_healthy
     env_file:
       - .env
+    networks:
+      local_net:
+        aliases:
+          - ${COMPOSE_PROJECT_NAME}-app
 
-  frontend:
+  web:
     image: nginx:alpine
     volumes:
       - ./frontend:/usr/share/nginx/html:ro
       - ./frontend/nginx.conf:/etc/nginx/conf.d/default.conf:ro
-    ports:
-      - "5173:80"
+        #    ports:
+        #- "5173:80"
     depends_on:
-      - web
+      - app
+    networks:
+      local_net:
+        aliases:
+          - ${COMPOSE_PROJECT_NAME}-web
 
 volumes:
   postgres_data:
+
+networks:
+  local_net:
+    name: ${NETWORK}
+    external: true
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 154a92a..2504a21 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -5,7 +5,7 @@ server {
 
     # Proxy API calls to Django
     location /api/ {
-        proxy_pass http://web:8000;
+        proxy_pass http://app:8000;
         proxy_set_header Host web;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -14,7 +14,7 @@ server {
 
     # Proxy media files to Django
     location /media/ {
-        proxy_pass http://web:8000;
+        proxy_pass http://app:8000;
         proxy_set_header Host web;
     }