-
-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
21a935f
commit 7b9023d
Showing
3 changed files
with
34 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,7 +34,7 @@ services: | |
- DJANGO_ADMIN_USERNAME=admin | ||
- DJANGO_ADMIN_PASSWORD=admin | ||
- [email protected] | ||
- 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
FROM nginx:alpine | ||
|
||
RUN rm /etc/nginx/conf.d/default.conf | ||
COPY nginx.conf /etc/nginx/conf.d |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
server { | ||
listen 80; | ||
server_name localhost; | ||
|
||
location /media/ { | ||
alias /app/media/; | ||
} | ||
} |