From db4074ab3381b0f9fd4c29595760e93e58325663 Mon Sep 17 00:00:00 2001 From: redfast00 Date: Sat, 25 Jul 2020 15:06:59 +0200 Subject: [PATCH] Add static config --- KeRS/settings.py | 2 ++ docker-compose.yml | 3 +++ web.env | 1 + 3 files changed, 6 insertions(+) diff --git a/KeRS/settings.py b/KeRS/settings.py index 8d31dab..e14b566 100644 --- a/KeRS/settings.py +++ b/KeRS/settings.py @@ -137,6 +137,8 @@ STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), ] +STATIC_ROOT = os.getenv('STATIC_ROOT') + # Celery CELERY_BROKER = os.getenv('CELERY_BROKER', 'redis://localhost:6379/0') diff --git a/docker-compose.yml b/docker-compose.yml index a228726..25ac492 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,8 +8,11 @@ services: restart: on-failure depends_on: - database + volumes: + - /var/www/kers/static:/static command: > sh -c "./scripts/wait_for_service database 3306 && + python manage.py collectstatic --no-input python manage.py migrate && python manage.py runserver 0.0.0.0:8000" diff --git a/web.env b/web.env index 0f3f688..25c29b4 100644 --- a/web.env +++ b/web.env @@ -9,3 +9,4 @@ OAUTH_CLIENT_SECRET=REPLACEME KERS_ADMIN_USERNAME=replaceme KERS_ADMIN_PASSWORD=replaceme ALLOWED_HOSTS=localhost +STATIC_ROOT=/static