diff --git a/Dockerfile b/Dockerfile index 1ffcacd..7241502 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.4 +FROM python:3.8 # Install the dependencies before copying the source code # as this prevents frequent docker build commands from having diff --git a/README.md b/README.md index dee7e3f..c3e9fd2 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ with the required dependencies based on requirements.txt The second command starts the container for use. docker build -t ripe-atlas-halo . - docker run -d -name my-ripe-atlas-halo -p 8000:8000 ripe-atlas-halo + docker run -d --name my-ripe-atlas-halo -p 8000:8000 ripe-atlas-halo Once the container has started, you can navigate to the interface on http://localhost:8000/ diff --git a/src/events/templates/events/dashboard.html b/src/events/templates/events/dashboard.html index c277192..16431cc 100644 --- a/src/events/templates/events/dashboard.html +++ b/src/events/templates/events/dashboard.html @@ -1,7 +1,7 @@ {% extends 'halo/base.html' %} -{% load staticfiles %} +{% load static %} {% block css %} diff --git a/src/halo/settings.py b/src/halo/settings.py index 9c3db0a..bd34f2c 100644 --- a/src/halo/settings.py +++ b/src/halo/settings.py @@ -45,17 +45,18 @@ ] -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] +MIDDLEWARE_CLASSES = MIDDLEWARE + ROOT_URLCONF = 'halo.urls' TEMPLATES = [ diff --git a/src/halo/templates/halo/base.html b/src/halo/templates/halo/base.html index 39dbee6..de46659 100644 --- a/src/halo/templates/halo/base.html +++ b/src/halo/templates/halo/base.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %}
diff --git a/src/halo/templates/halo/index.html b/src/halo/templates/halo/index.html index ce1029b..3d74d83 100644 --- a/src/halo/templates/halo/index.html +++ b/src/halo/templates/halo/index.html @@ -1,7 +1,7 @@ {% extends 'halo/base.html' %} -{% load staticfiles %} +{% load static %} {% block css %}