Merge branch 'app.wiai.de' of https://mg-server.ddns.net/git/BaStA/basta-server into app.wiai.de

This commit is contained in:
otrs 2018-04-04 18:52:28 +02:00
commit e8198bc0df
2 changed files with 2 additions and 1 deletions

View File

@ -7,6 +7,7 @@ WORKDIR /app
EXPOSE 80 EXPOSE 80
VOLUME ["/app/data"] VOLUME ["/app/data"]
VOLUME ["/app/media"] VOLUME ["/app/media"]
VOLUME ["/app/log"]
ENTRYPOINT ["python3", "manage.py"] ENTRYPOINT ["python3", "manage.py"]
ADD ["ofu_app", "/app"] ADD ["ofu_app", "/app"]
CMD ["runserver", "0.0.0.0:80"] CMD ["runserver", "0.0.0.0:80"]

View File

@ -74,7 +74,7 @@ TIME_FORMAT = "H:i"
ROOT_URLCONF = 'core.urls' ROOT_URLCONF = 'core.urls'
WSGI_APPLICATION = 'core.wsgi.application' WSGI_APPLICATION = 'core.wsgi.application'
STATIC_URL = '/static/' STATIC_URL = '/static-dev/'
STATIC_ROOT = os.path.join(BASE_DIR, "static_files") STATIC_ROOT = os.path.join(BASE_DIR, "static_files")
STATICFILES_DIRS = [ STATICFILES_DIRS = [
os.path.join(BASE_DIR, "static"), os.path.join(BASE_DIR, "static"),