From c15d277760fc4f382ef49b3ed817266142e9f936 Mon Sep 17 00:00:00 2001
From: Abraham Martin <amc203@cam.ac.uk>
Date: Mon, 11 Mar 2024 18:38:08 +0000
Subject: [PATCH] feat: upgrade to django 4.2

---
 Dockerfile            | 4 ++--
 requirements/base.txt | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b08cd90..146d4f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Use node container to build frontend app
-FROM node:10 as frontend-builder
+FROM node:21 as frontend-builder
 
 # Do everything relative to /usr/src/app which is where we install our
 # application.
@@ -10,7 +10,7 @@ ADD ./ui/frontend/ ./
 RUN npm install && npm run build
 
 # Build webapp image
-FROM registry.gitlab.developers.cam.ac.uk/uis/devops/infra/dockerimages/django:2.2-py3.7
+FROM registry.gitlab.developers.cam.ac.uk/uis/devops/infra/dockerimages/django:4.2-py3.11
 
 # From now on, work in the application directory
 WORKDIR /usr/src/app
diff --git a/requirements/base.txt b/requirements/base.txt
index 679d34f..4af81bc 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,7 +1,5 @@
 # Requirements for Lecture Capture Preferences itself
-django~=2.2
-# Pin the version of psycopg to avoid https://github.com/psycopg/psycopg2/issues/1293
-psycopg2-binary>=2.8,<2.9
+django~=4.2.10
 # explicitly specify django-automationcommon's git repo since changes in
 # automationcommon tend to be "ad hoc" and may need testing here without a
 # corresponding pypi release. Recall that git branched may be explicitly given
@@ -12,7 +10,7 @@ django-ucamwebauth>=1.4.5
 
 # Make sure we use a version of django-ucamlookup with the latest lookup
 # certificate.
-django-ucamlookup>=3.0.5,<4
+django-ucamlookup~=3.1.0
 
 # API-related Django packages
 djangorestframework
-- 
GitLab