diff --git a/config/nginx/local.conf b/config/nginx/local.conf index 1bbe1d0..34f5fc8 100644 --- a/config/nginx/local.conf +++ b/config/nginx/local.conf @@ -1,19 +1,19 @@ -upstream restgunicorn_server{ +upstream django_server{ server django:8000; } server{ listen 8080; - server_name localhost; + server_name localhost; location / { - proxy_pass http://restgunicorn_server; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - proxy_redirect off; + proxy_pass http://django_server; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; } location /django_static/ { - alias /src/django_static/; + alias /django_static/; } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 70cc2cd..ce42c65 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,17 +5,20 @@ services: image: postgres volumes: - dbdata:/var/lib/postgresql/data - - static_volume:/src/django_static env_file: - config/db/databasepostgresql_env django: + environment: + - DJANGO_SETTINGS_MODULE=config.settings.production build: . - command: gunicorn src.config.wsgi:application --bind 0.0.0.0:8000 + command: python3 src/manage.py runserver 0.0.0.0:8000 --settings=config.settings.production ports: - "8000:8000" depends_on: - db + volumes: + - static_volume:/django_static nginx: image: nginx @@ -23,7 +26,7 @@ services: - "1337:8080" volumes: - ./config/nginx/local.conf:/etc/nginx/conf.d/default.conf:ro - - static_volume:/src/django_static + - static_volume:/django_static depends_on: - django diff --git a/src/config/settings/production.py b/src/config/settings/production.py index 94cd408..25e8a13 100644 --- a/src/config/settings/production.py +++ b/src/config/settings/production.py @@ -17,9 +17,7 @@ DATABASES = { } STATIC_URL = '/django_static/' -STATIC_ROOT = [ - BASE_DIR / 'django_static' -] +STATIC_ROOT = os.path.join(os.path.dirname(os.path.dirname(BASE_DIR)), 'django_static') STATICFILES_DIRS = [ - BASE_DIR / 'django_static/static' + BASE_DIR / 'static' ] \ No newline at end of file diff --git a/src/config/wsgi.py b/src/config/wsgi.py index e2f82e6..a9f185c 100644 --- a/src/config/wsgi.py +++ b/src/config/wsgi.py @@ -2,6 +2,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.production') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') application = get_wsgi_application()