Merge pull request #3 from NHSDigital/whitenoise

Self contained image that serves static files

Author: MatMoore

Dockerfile

@@ -66,6 +66,9 @@ COPY --chown=${CONTAINER_USER}:${CONTAINER_GROUP} manage.py ./
 ENV DEBUG=0
 RUN python ./manage.py collectstatic --noinput
 
+# Remove later once we've set up an external DB
+RUN python ./manage.py migrate
+
 EXPOSE 8000
 
 ENTRYPOINT ["/app/.venv/bin/gunicorn", "--bind", "0.0.0.0:8000", "manage_breast_screening.config.wsgi"]

manage_breast_screening/config/settings.py

@@ -10,6 +10,7 @@
 https://docs.djangoproject.com/en/5.1/ref/settings/
 """
 
+import sys
 from os import environ
 from pathlib import Path
 
@@ -45,13 +46,7 @@ def boolean_env(key, default=None):
 if allowed_hosts_except_localhost:
     CSRF_COOKIE_SECURE = True
     SESSION_COOKIE_SECURE = True
-    SECURE_SSL_REDIRECT = True
-
-    # Strict transport security:
-    # https://docs.djangoproject.com/en/5.1/ref/middleware/#http-strict-transport-security
-    SECURE_HSTS_SECONDS = 60
-    SECURE_HSTS_INCLUDE_SUBDOMAINS = True
-    SECURE_HSTS_PRELOAD = False
+    SECURE_SSL_REDIRECT = False
 
 # Application definition
 
@@ -67,6 +62,7 @@ def boolean_env(key, default=None):
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
@@ -115,6 +111,11 @@ def boolean_env(key, default=None):
     }
 }
 
+STORAGES = {
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
 
 # Password validation
 # https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators
@@ -160,3 +161,32 @@ def boolean_env(key, default=None):
 # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+LOGGING = {
+    "version": 1,  # the dictConfig format version
+    "disable_existing_loggers": False,  # retain the default loggers
+    "formatters": {
+        "verbose": {
+            "format": "{levelname} {asctime} {module} {process:d} {thread:d} {message}",
+            "style": "{",
+        },
+    },
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "formatter": "verbose",
+            "stream": sys.stdout,
+        },
+    },
+    "root": {
+        "handlers": ["console"],
+        "level": "DEBUG",
+    },
+    "loggers": {
+        "django": {
+            "level": "DEBUG",
+            "handlers": ["console"],
+            "propagate": False,
+        },
+    },
+}

manage_breast_screening/config/urls.py

@@ -28,6 +28,3 @@
     ),
     path("", RedirectView.as_view(pattern_name="clinics:index")),
 ]
-
-if settings.DEBUG:
-    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

manage_breast_screening/templates/assets/favicons/apple-touch-icon-180x180.png renamed to manage_breast_screening/static/assets/favicons/apple-touch-icon-180x180.png

@@ -6,7 +6,7 @@ authors = [{ name = "Your Name", email = "[email protected]" }]
 license = { text = "MIT" }
 readme = "README.md"
 requires-python = ">=3.13"
-dependencies = ["django (>=5.1.7,<6.0.0)", "dotenv (>=0.9.9,<0.10.0)", "gunicorn (>=23.0.0,<24.0.0)", "jinja2 (>=3.1.6,<4.0.0)"]
+dependencies = ["django (>=5.1.7,<6.0.0)", "dotenv (>=0.9.9,<0.10.0)", "gunicorn (>=23.0.0,<24.0.0)", "jinja2 (>=3.1.6,<4.0.0)", "whitenoise[brotli] (>=6.9.0,<7.0.0)"]
 
 [tool.poetry]
 package-mode = false

manage_breast_screening/templates/assets/favicons/apple-touch-icon.png renamed to manage_breast_screening/static/assets/favicons/apple-touch-icon.png

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cp -r node_modules/nhsuk-frontend/packages/{components,macros,assets} manage_breast_screening/templates/
-
-cp -r node_modules/nhsuk-frontend/dist/nhsuk-* manage_breast_screening/static/
+cp -r node_modules/nhsuk-frontend/packages/{components,macros} manage_breast_screening/templates/
+cp -r node_modules/nhsuk-frontend/packages/assets manage_breast_screening/static/
+cp -r node_modules/nhsuk-frontend/dist/nhsuk-* manage_breast_screening/static/