diff --git a/backend/django/seatstock_django/db.sqlite3 b/backend/django/seatstock_django/db.sqlite3 index c642d53..f543dde 100644 Binary files a/backend/django/seatstock_django/db.sqlite3 and b/backend/django/seatstock_django/db.sqlite3 differ diff --git a/backend/django/seatstock_django/seatstock_django/settings.py b/backend/django/seatstock_django/seatstock_django/settings.py index 8ed281e..641fc9d 100644 --- a/backend/django/seatstock_django/seatstock_django/settings.py +++ b/backend/django/seatstock_django/seatstock_django/settings.py @@ -27,7 +27,7 @@ SECRET_KEY = 'django-insecure---ve)lzpo4*frbw+zylax#h=frp-h5f4sx5*1-pipq&rgfl$k9 # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['docker-django', 'localhost', 'seatstock.duckdns.org'] # Application definition @@ -86,6 +86,10 @@ DATABASES = { } +ENV_FILE = find_dotenv() +if ENV_FILE: + load_dotenv(ENV_FILE) + # Password validation # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e10c5bc..8c5c0a2 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,7 +6,7 @@ services: image: nginx:latest restart: unless-stopped ports: - - "8080:80" + - "80:80" volumes: - ../frontend:/usr/share/nginx/html - ./volumes/nginx/config/default.conf:/etc/nginx/conf.d/default.conf:ro @@ -19,3 +19,7 @@ services: - "8000:8000" volumes: - ../backend/django:/home/app/webapp + environment: + - AUTH0_DOMAIN=${AUTH0_DOMAIN} + - AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID} + - AUTH0_CLIENT_SECRET=${AUTH0_CLIENT_SECRET} diff --git a/docker/volumes/nginx/config/default.conf b/docker/volumes/nginx/config/default.conf index 452337c..8a99fa9 100644 --- a/docker/volumes/nginx/config/default.conf +++ b/docker/volumes/nginx/config/default.conf @@ -7,19 +7,30 @@ server { location /ngxapi/transaction { - proxy_pass http://localhost:8000/transaction; + proxy_pass http://docker-django:8000/transaction; } location /ngxapi/search { - proxy_pass http://localhost:8000/search; + proxy_pass http://docker-django:8000/search; } location /ngxapi/query_games { - proxy_pass http://localhost:8000/query_games; + proxy_pass http://docker-django:8000/query_games; } location /ngxapi/account { - proxy_pass http://localhost:8000/account; + proxy_pass http://docker-django:8000/account; + } + + location /login { + proxy_pass http://docker-django:8000/login; + proxy_set_header Host $host; + + } + + location /callback { + proxy_pass http://docker-django:8000/callback; + proxy_set_header Host $host; }