From 66c989ea9774d2b22cae96374b6b5539b587f224 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Wed, 1 Jan 2020 20:42:44 +0100 Subject: [PATCH] =?UTF-8?q?NginX=20docker=20not=20yet=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 4 +++- nginx/Dockerfile | 2 +- nginx/villafleurie.conf | 2 +- villafleurie/settings.py | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a47e1d2..a53d4b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: web: build: . command: bash -c "python manage.py migrate && python manage.py loaddata villafleurie.json && gunicorn -w 4 villafleurie.wsgi -b 0.0.0.0:8000" - container_name: villafleurie + # container_name: villafleurie volumes: - .:/villafleurie - static_files:/static_files @@ -29,3 +29,5 @@ services: - 80:80 volumes: - static_files:/static_files + depends_on: + - web diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 4a65074..0f30364 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx +FROM nginx:latest RUN rm /etc/nginx/conf.d/default.conf diff --git a/nginx/villafleurie.conf b/nginx/villafleurie.conf index 840bfc6..e32e3aa 100644 --- a/nginx/villafleurie.conf +++ b/nginx/villafleurie.conf @@ -9,7 +9,7 @@ server { } location / { - proxy_pass http://127.0.0.1:8000; + proxy_pass http://web:8000; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; } diff --git a/villafleurie/settings.py b/villafleurie/settings.py index 3e0abe1..d4d1c54 100644 --- a/villafleurie/settings.py +++ b/villafleurie/settings.py @@ -29,7 +29,7 @@ if os.environ.get('ENV') == 'PRODUCTION': # STATICFILES_DIRS = (os.path.join(PROJECT_ROOT, 'static'),) # os.makedirs(STATIC_TMP, exist_ok=True) # os.makedirs(STATIC_ROOT, exist_ok=True) - STATIC_ROOT = "/static_files/" + STATIC_ROOT = "/static/" CSRF_COOKIE_SECURE = True SESSION_COOKIE_SECURE = True CONN_MAX_AGE = 500 @@ -56,6 +56,7 @@ else: # STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles') ALLOWED_HOSTS = [ + '0.0.0.0', '127.0.0.1', 'localhost' ]