diff --git a/docker-compose.yml b/docker-compose.yml index 2180b689..cc5a1282 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: - DJANGO_ADMIN_USERNAME=admin - DJANGO_ADMIN_PASSWORD=admin - DJANGO_ADMIN_EMAIL=admin@example.com - - PUBLIC_URL='http://127.0.0.1:8000' + - PUBLIC_URL='http://127.0.0.1:81' - DEBUG=True ports: - "8000:8000" @@ -43,6 +43,27 @@ services: volumes: - adventurelog_media:/code/media/ + nginx: + image: nginx:latest + ports: + - "81:80" # Using port 81 to avoid conflict with your existing setup + volumes: + - adventurelog_media:/app/media + - ./proxy/nginx.conf:/etc/nginx/conf.d/default.conf:ro + depends_on: + - server + volumes: postgres_data: adventurelog_media: +# +# nginx: +# build: +# context: ./proxy/ +# dockerfile: Dockerfile.nginx +# ports: +# - "81:80" # Using port 81 to avoid conflict with your existing setup +# volumes: +# - adventurelog_media:/app/media +# depends_on: +# - server diff --git a/proxy/Dockerfile.nginx b/proxy/Dockerfile.nginx new file mode 100644 index 00000000..4c49d2ee --- /dev/null +++ b/proxy/Dockerfile.nginx @@ -0,0 +1,4 @@ +FROM nginx:alpine + +RUN rm /etc/nginx/conf.d/default.conf +COPY nginx.conf /etc/nginx/conf.d \ No newline at end of file diff --git a/proxy/nginx.conf b/proxy/nginx.conf new file mode 100644 index 00000000..67f5f0df --- /dev/null +++ b/proxy/nginx.conf @@ -0,0 +1,8 @@ +server { + listen 80; + server_name localhost; + + location /media/ { + alias /app/media/; + } +} \ No newline at end of file