diff --git a/backend/nginx.conf b/backend/nginx.conf index a58fce5..fafff04 100644 --- a/backend/nginx.conf +++ b/backend/nginx.conf @@ -1,4 +1,5 @@ worker_processes 1; + events { worker_connections 1024; } @@ -12,29 +13,29 @@ http { client_max_body_size 100M; + # The backend is running in the same container, so reference localhost upstream django { - server server:8000; # Use the internal Docker networking + server 127.0.0.1:8000; # Use localhost to point to Gunicorn running internally } server { - listen 80; # NGINX always listens on port 80 inside the container + listen 80; # NGINX listens on port 80 inside the container server_name localhost; location / { - proxy_pass http://server:8000; # Explicitly forward to Django service + proxy_pass http://django; # Forward to the upstream block proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; } - location /static/ { alias /code/staticfiles/; # Serve static files directly } location /media/ { - alias /code/media/; # Serve media files directly + alias /code/media/; # Serve media files directly } } } diff --git a/docker-compose.yml b/docker-compose.yml index efaf95d..eca6a8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: container_name: adventurelog-frontend restart: unless-stopped environment: - - PUBLIC_SERVER_URL=http://server:8000 # MOST DOCKER USERS WILL NOT NEED TO CHANGE THIS EVER EVEN IF YOU CHANGE THE OUTWARD PORT + - PUBLIC_SERVER_URL=http://server:8000 # Should be the service name of the backend with port 8000, even if you change the port in the backend service - ORIGIN=http://localhost:8015 - BODY_SIZE_LIMIT=Infinity ports: