Eatyourpeas/issue20

.gitignore

@@ -99,6 +99,7 @@ env.bak/
 venv.bak/
 *live.env
 *development.env
+envs/.env
 
 # mypy
 .mypy_cache/
@@ -122,4 +123,8 @@ staticfiles/
 
 # Docker and docker compose
 .pip_cache
-.data
+.data
+
+celerybeat-schedule
+
+staticdocs/

Caddyfile

@@ -0,0 +1,25 @@
+# GLOBALS
+{
+    email {$LETSENCRYPT_EMAIL_ADDRESS}
+    acme_ca {$LETSENCRYPT_ENDPOINT}
+}
+
+# DJANGO
+{$SITE_DOMAIN} {
+    tls {$TLS_SOURCE}
+
+    # DJANGO
+    reverse_proxy http://django:8005
+
+    # MKDOCS static files are served from a /docs path
+    handle_path /docs/* {
+        root * /srv/staticdocs
+        file_server {
+            index index.html
+        }
+    }
+
+    log {
+        level ERROR # options are DEBUG, INFO, ERROR from most to least verbose
+    }
+}

Dockerfile

@@ -1,10 +1,18 @@
 # Base Docker image Official Python 3.11
 FROM python:3.11
- 
-# Set 'build-time' environment variables  
+
+# Set 'build-time' environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
+# Setup GDAL + PILLOW required for CAPTCHA and postgis
+RUN apt-get update &&\
+    apt-get install -y binutils libproj-dev gdal-bin libgdal-dev python3-gdal &&\
+    apt-get install -y  libz-dev libjpeg-dev libfreetype6-dev
+
+# Extra packages required for Material for MkDocs plugins (dependency for git and pdf plugins)
+RUN apt install -y git python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0
+
 # Add Development requirements
 COPY requirements/development-requirements.txt /app/requirements/development-requirements.txt
 COPY requirements/common-requirements.txt /app/requirements/common-requirements.txt
@@ -16,12 +24,12 @@ WORKDIR /app/requirements/
 RUN pip install --upgrade pip 
 RUN pip install -r /app/requirements/development-requirements.txt
 
+# Set safe working directory for git
+RUN git config --global --add safe.directory /app
+
 # Set working directory back to main app
 WORKDIR /app/
 
 # Copy application code into image
 # (Excludes any files/dirs matched by patterns in .dockerignore)
-COPY . /app/
-
-# Use port 8001 in development (may be overridden by docker-compose file)
-EXPOSE 8001
+COPY . /app/

deprivation_scores/apps.py

@@ -2,5 +2,5 @@
 
 
 class DeprivationScoresConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'deprivation_scores'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "deprivation_scores"

deprivation_scores/constants/__init__.py

@@ -0,0 +1,4 @@
+from .northern_ireland_postcodes import *
+from .scottish_postcodes import *
+from .welsh_postcodes import *
+from .english_deprivation_test_data import *