From 420d3e4df85b984b47314340764e921fe55a0160 Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Tue, 4 Feb 2020 22:15:08 +0100
Subject: [PATCH] static files
---
Dockerfile.prod | 1 +
src/entrypoint.sh | 1 +
src/kszkepzes/settings/base.py | 2 +-
src/kszkepzes/settings/production.py | 1 -
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Dockerfile.prod b/Dockerfile.prod
index ef6ac28..b890bd0 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -44,6 +44,7 @@ RUN groupadd app && useradd -g app app
ENV HOME=/home/app
ENV APP_HOME=/home/app/kszkepzes-backend
RUN mkdir $APP_HOME
+RUN mkdir $APP_HOME/staticfiles
WORKDIR $APP_HOME
# install dependencies
diff --git a/src/entrypoint.sh b/src/entrypoint.sh
index 84c4515..e837b4f 100755
--- a/src/entrypoint.sh
+++ b/src/entrypoint.sh
@@ -13,5 +13,6 @@ fi
python manage.py flush --no-input
python manage.py migrate
+python manage.py collectstatic --no-input --clear
exec "$@"
\ No newline at end of file
diff --git a/src/kszkepzes/settings/base.py b/src/kszkepzes/settings/base.py
index 79bb090..1e9a301 100644
--- a/src/kszkepzes/settings/base.py
+++ b/src/kszkepzes/settings/base.py
@@ -13,7 +13,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/
import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
# Quick-start development settings - unsuitable for production
diff --git a/src/kszkepzes/settings/production.py b/src/kszkepzes/settings/production.py
index 785c982..f6d3649 100644
--- a/src/kszkepzes/settings/production.py
+++ b/src/kszkepzes/settings/production.py
@@ -24,7 +24,6 @@ REST_FRAMEWORK = {
)
}
-STATIC_ROOT = os.path.join(BASE_DIR, 'static_collected')
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'mail.sch.bme.hu'
EMAIL_PORT = 25
--
GitLab