Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Making it work with Python 3.8 and Django 3.2.7 (docker) #9

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Making it work with Python 3.8 and Django 3.2.7 (docker) #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d7a13a
Bump python to 3.8
dantecl Sep 28, 2021
872e909
Changed middleware var for compatibility reasons
dantecl Sep 28, 2021
b1bbd8b
Fix docker run cmd
dantecl Sep 28, 2021
090ea04
Fix some Django 2.x stuff
dantecl Sep 28, 2021
d2e6366
rename var
dantecl Sep 28, 2021
26fe093
rename var
dantecl Sep 28, 2021
396a813
rename var
dantecl Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion src/events/templates/events/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'halo/base.html' %}


{% load staticfiles %}
{% load static %}


{% block css %}
Expand Down
5 changes: 3 additions & 2 deletions src/halo/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion src/halo/templates/halo/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load staticfiles %}<!DOCTYPE html>
{% load static %}<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
Expand Down
2 changes: 1 addition & 1 deletion src/halo/templates/halo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'halo/base.html' %}


{% load staticfiles %}
{% load static %}


{% block css %}
Expand Down