maggicl/arrowcounter
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed static files for admin

Browse source
This commit is contained in:
Claudio Maggioni (maggicl) 2019-04-28 16:04:26 +02:00
parent 8e9d185293
commit 4bf2eb6389
4 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,3 +1,6 @@
/static/
!/static/.gitkeep
### OSX ### ### OSX ###
.DS_Store .DS_Store
.AppleDouble .AppleDouble

6
Dockerfile
View file

@ -17,7 +17,7 @@ FROM alpine:3.8
MAINTAINER Claudio Maggioni (praticamentetilde) MAINTAINER Claudio Maggioni (praticamentetilde)
RUN addgroup -S app && adduser -S -G app app RUN addgroup -S app && adduser -S -G app app
# Install required packages and remove the apt packages cache when done # Install required packages and remove the apt packages cache when done
RUN apk update && apk add \ RUN apk update && apk add \
@ -26,7 +26,7 @@ RUN apk update && apk add \
uwsgi-python3 \ uwsgi-python3 \
git \ git \
python3 \ python3 \
python3-dev python3-dev
# COPY requirements.txt and RUN pip install BEFORE adding the rest of your # COPY requirements.txt and RUN pip install BEFORE adding the rest of your
# code, this will cause Docker's caching mechanism to prevent re-installing # code, this will cause Docker's caching mechanism to prevent re-installing
@ -40,6 +40,8 @@ COPY . /home/app/code/
RUN chown -R app: /home/app RUN chown -R app: /home/app
RUN python3 /home/app/code/manage.py collectstatic --no-input
EXPOSE 8000 EXPOSE 8000
CMD ["/usr/sbin/uwsgi", "--ini", "/home/app/code/uwsgi.ini", "--plugin", "python3"] CMD ["/usr/sbin/uwsgi", "--ini", "/home/app/code/uwsgi.ini", "--plugin", "python3"]
USER app USER app

2
arrowcounter/settings.py
View file

@ -37,6 +37,8 @@ LOGOUT_REDIRECT_URL = "/"
ITEMS_PER_PAGE = 30 ITEMS_PER_PAGE = 30
STATIC_ROOT = "static/"
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [

28
manage.py
View file

@ -6,16 +6,26 @@ from os import path
if __name__ == '__main__': if __name__ == '__main__':
env_path = path.join(path.dirname(path.realpath(__file__)), '.env') env_path = path.join(path.dirname(path.realpath(__file__)), '.env')
load_dotenv(verbose=True,dotenv_path=env_path) if not os.path.exists(env_path) and len(sys.argv) >= 2 and len(sys.argv) <= 3 \
and sys.argv[1] == 'collectstatic':
os.environ['POSTGRES_DB'] = ''
os.environ['POSTGRES_HOST'] = ''
os.environ['POSTGRES_USER'] = ''
os.environ['POSTGRES_PASSWORD'] = ''
os.environ['DEBUG'] = 'false'
os.environ['ALLOWED_HOSTS'] = ''
os.environ['SECURITY_KEY'] = 'dummy-value'
else:
load_dotenv(verbose=True,dotenv_path=env_path)
check_env_vars = ['POSTGRES_DB', 'POSTGRES_HOST', 'POSTGRES_PASSWORD', check_env_vars = ['POSTGRES_DB', 'POSTGRES_HOST', 'POSTGRES_PASSWORD',
'POSTGRES_USER', 'DEBUG', 'ALLOWED_HOSTS'] 'POSTGRES_USER', 'DEBUG', 'ALLOWED_HOSTS', 'SECURITY_KEY']
for key in check_env_vars: for key in check_env_vars:
if key not in os.environ: if key not in os.environ:
sys.stderr.write('The mandatory environment ' \ sys.stderr.write('The mandatory environment ' \
'variable ' + key + ' is not set\n') 'variable ' + key + ' is not set\n')
sys.exit(1) sys.exit(1)
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'arrowcounter.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'arrowcounter.settings')
try: try: