Skip to content

Commit

Permalink
Merge pull request #4 from TwoPointerr/TM-main-update
Browse files Browse the repository at this point in the history
azure changes 2
  • Loading branch information
mandharet committed Feb 17, 2024
2 parents 9e84a8d + 2ffe55e commit 34f8d6b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
12 changes: 7 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
version: '2.15.1'

services:
django_gunicorn:
grievance_gunicorn:
image: mandharet/project-clean-django:latest
volumes:
- static:/code/static
env_file:
- .env
build:
context: .
# build:
# context: .
ports:
- "8000:8000"

nginx:
build: ./nginx
# build: ./nginx
image: mandharet/project-clean:latest
volumes:
- static:/code/static
ports:
- "80:80"
depends_on:
- django_gunicorn
- grievance_gunicorn

volumes:
static:
6 changes: 3 additions & 3 deletions nginx/default.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
upstream django{
server django_gunicorn:8000;
upstream grievance{
server grievance_gunicorn:8000;
}

server{
listen 80;

location / {
proxy_pass http://django;
proxy_pass http://grievance;
}

location /static/ {
Expand Down

0 comments on commit 34f8d6b

Please sign in to comment.