Fix small bug in templates and tweak settings

This commit is contained in:
Livvy Mackintosh
2017-10-31 16:00:44 +01:00
parent 43d6ec989b
commit aa6c1cf33b
5 changed files with 10 additions and 20 deletions

View File

@ -20,8 +20,8 @@ services:
- /containers/map/static:/app/static
- /containers/map/gunicorn.sock:/app/gunicorn.sock
env_file:
- ./local.env
command: /bin/sh -c "python3 manage.py migrate && DEBUG=1 python3 manage.py collectstatic --noinput && gunicorn --bind 0.0.0.0:8000 ojusomap.wsgi"
- ./environment
command: /bin/sh -c "DEBUG=1 python3 manage.py collectstatic --noinput && python3 manage.py compilemessages && python3 manage.py migrate && gunicorn --bind 0.0.0.0:8000 ojusomap.wsgi"
db:
restart: always
@ -78,18 +78,7 @@ services:
- /containers/jenkins:/var/jenkins_home
- /var/run/docker.sock:/var/run/docker.sock
static:
image: nginx:alpine
restart: always
labels:
- "traefik.backend=static"
- "traefik.frontend.rule=Host:map.ojuso.org;PathPrefixStrip:/static/"
- "traefik.frontend.priority=10"
networks:
- web
volumes:
- /containers/map/static:/usr/share/nginx/html:ro
weblate_static:
image: nginx:alpine
restart: always