From 1d7a13a9ac1c206e0883321d656ef42fa1bbf1b8 Mon Sep 17 00:00:00 2001 From: Dante Lanznaster Date: Mon, 27 Sep 2021 22:34:42 -0700 Subject: [PATCH 1/7] Bump python to 3.8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 872e90932a36365826743b6ceb76f96bba4f1a24 Mon Sep 17 00:00:00 2001 From: Dante Lanznaster Date: Mon, 27 Sep 2021 22:37:07 -0700 Subject: [PATCH 2/7] Changed middleware var for compatibility reasons --- src/halo/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/halo/settings.py b/src/halo/settings.py index 9c3db0a..2a4bf7c 100644 --- a/src/halo/settings.py +++ b/src/halo/settings.py @@ -45,7 +45,7 @@ ] -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', From b1bbd8b6492356d810213ba862ebb47e047cfc20 Mon Sep 17 00:00:00 2001 From: Dante Lanznaster Date: Mon, 27 Sep 2021 22:40:12 -0700 Subject: [PATCH 3/7] Fix docker run cmd --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/ From 090ea0442ddca88ab96e3967c7a7161f1fc7f956 Mon Sep 17 00:00:00 2001 From: Dante Lanznaster Date: Mon, 27 Sep 2021 22:49:13 -0700 Subject: [PATCH 4/7] Fix some Django 2.x stuff --- src/halo/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/halo/settings.py b/src/halo/settings.py index 2a4bf7c..bd34f2c 100644 --- a/src/halo/settings.py +++ b/src/halo/settings.py @@ -51,11 +51,12 @@ '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 = [ From d2e63661c750c8675649cd4f716a1ea071e241af Mon Sep 17 00:00:00 2001 From: Dante Lanznaster Date: Mon, 27 Sep 2021 23:01:07 -0700 Subject: [PATCH 5/7] rename var --- src/halo/templates/halo/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %} From 26fe0938963e30079857d7817d34c931f19742b5 Mon Sep 17 00:00:00 2001 From: Dante Lanznaster Date: Mon, 27 Sep 2021 23:01:21 -0700 Subject: [PATCH 6/7] rename var --- src/halo/templates/halo/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %} From 396a8138b66d866bb7f1f987603a194baf0fa1f1 Mon Sep 17 00:00:00 2001 From: Dante Lanznaster Date: Mon, 27 Sep 2021 23:01:39 -0700 Subject: [PATCH 7/7] rename var --- src/events/templates/events/dashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %}