From 8ab12d01d0d6f2f7964924ed7866c94d566f9ebd Mon Sep 17 00:00:00 2001
From: Tim Band <t.b@ucl>
Date: Fri, 23 Jan 2026 13:56:48 +0000
Subject: [PATCH 1/6] Updated docker and Python dependencies - slim-buster no
 longer available, updated to trixie - updated Python dependencies to work on
 trixie - removed obsolete Dockerfile version: - Dockerfile pull_policy to
 prevent docker from trying to pull from docker hub - external postgres port
 should not clash with local postgres - docker volume flags :z and :Z are
 ignored (and attract warnings)

---
 README.md                                 | 130 ++++++++--------------
 src/compose/development/django/Dockerfile |   2 +-
 src/compose/local/django/Dockerfile       |   2 +-
 src/compose/local/docs/Dockerfile         |   2 +-
 src/compose/production/django/Dockerfile  |   2 +-
 src/development.yml                       |   2 -
 src/local.yml                             |  19 ++--
 src/production.yml                        |   2 -
 src/requirements/base.txt                 |   4 +-
 src/requirements/development.txt          |   2 +-
 src/requirements/local.txt                |   8 +-
 src/requirements/production.txt           |   2 +-
 12 files changed, 71 insertions(+), 106 deletions(-)

diff --git a/README.md b/README.md
index 8b44f007d..02cda3812 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,9 @@ This project uses containers. Below are set up instructions and useful commands.
 ### 1. Install Docker Engine
 
 - Follow the instructions here for your platform: https://docs.docker.com/get-docker/
-- You will need to create a free Docker account and sign into it
+- You don't need Docker Desktop necessarily, the command line tool is sufficient.
 
-### 2. Generate ssh keys for GitHub (if not already done)
-
-- Log into GitHub
-- Select 'Settings' from the drop down on the top right menu
-- Select 'SSH and GPG keys' from the left menu
-- Follow the [instructions in their guide](https://docs.github.com/articles/generating-an-ssh-key/)
-
-### 3. Setup a virtual environment and checkout the RARD source code
+### 2. Checkout the RARD source code
 
 - Create a working folder, e.g. `~/projects/` and `cd` into it
 
@@ -46,33 +39,7 @@ This project uses containers. Below are set up instructions and useful commands.
 
 ```git checkout development```
 
-- Create a virtual environment; e.g. with virtualenvwrapper:
-
-```mkvirtualenv -a ~/projects/frrant frrant```
-
-- Install the requirements for local development (including pre-commit, flake8, black etc.):
-
-```pip install -r src/requirements/local.txt```
-
-### 4. Tell Docker about your folder
-
-Docker needs to know the full path of your project folder (so it can look for changes)
-
-- Open the Docker application
-- Find 'Preferences' and then 'Resources'
-- Click 'File Sharing'
-- Remove any unnecesary folders e.g. `/tmp`, `/var`
-(Docker can use a lot of resources when watching folders for changes so it is best to keep this list to the absolute minimum)
-- Click 'Add' (or '+') to add a new folder
-- Browse to your projects folder and click 'Open'
-- Click 'Apply and Restart'
-
-(Docker needs to restart for the changes to take effect).
-
-More info is available online for your specific client, e.g. here for the Mac client:
-https://docs.docker.com/docker-for-mac/#file-sharing
-
-### 5. Build the containers
+### 3. Build the containers
 
 - For the example project location above:
 
@@ -80,22 +47,23 @@ https://docs.docker.com/docker-for-mac/#file-sharing
 
 Note that for running locally (on our own machines) we use the `local.yml` config and not `production.yml` which is for deployment to the production platform.
 
-```docker-compose -f local.yml build```
+```docker compose -f local.yml build```
+
+(or `docker-compose` for older versions of Docker) to ensure everything is built from scratch, you can add `--no-cache`
 
-to ensure everything is built from scratch, you can add `--no-cache`
-```docker-compose -f local.yml build --no-cache```
+```docker compose -f local.yml build --no-cache```
 
 - Bring up the project
 
-```docker-compose -f local.yml up```
+```docker compose -f local.yml up```
 
 or as a background process:
 
-```docker-compose -f local.yml up -d```
+```docker compose -f local.yml up -d```
 
 NB the output will be hidden when run in the background. To inspect the logs after the fact:
 
-```docker-compose -f local.yml logs -f```
+```docker compose -f local.yml logs -f```
 
 (the `-f` will update the output as more log messages come in. Omit `-f` to just see a snapshot).
 
@@ -103,19 +71,19 @@ NB the output will be hidden when run in the background. To inspect the logs aft
 
 To restart the project, e.g. if some changes have been made to code that don't need the container to be rebuilt then use:
 
-```docker-compose -f local.yml down```
+```docker compose -f local.yml down```
 
-```docker-compose -f local.yml up```
+```docker compose -f local.yml up```
 
 If any changes are made to the machine configuration, e.g. new pip packages installed, then the project will need to be rebuilt. Safest is to rebuild with no cache (see above) though this will take longer. Depending on the change it might be advisable to try rebuilding first without the `--no-cache` option to save time.
 
-```docker-compose -f local.yml down```
+```docker compose -f local.yml down```
 
-```docker-compose -f local.yml build [--no-cache]```
+```docker compose -f local.yml build [--no-cache]```
 
-```docker-compose -f local.yml up```
+```docker compose -f local.yml up```
 
-### 6. User Accounts
+### 4. User Accounts
 
 User accounts are created by the superuser. For convenience, and *on local development containers only* a superuser account is automatically created when the container is built.
 
@@ -125,25 +93,25 @@ Create users in the standard Django admin.
 
 Log out of the admin and navigate to `localhost:8000` and follow the links to log in with the credentials you entered.
 
-### 7. Useful Docker commands
+### 5. Useful Docker commands
 
-Commands (shell or Django commands etc) are run on the Docker container via `docker-compose` using the local configuration.
+Commands (shell or Django commands etc) are run on the Docker container via `docker compose` using the local configuration.
 
 Your container needs to be running while these commands are run.
 
-#### To stop a container:
+#### To stop the containers:
 
-```docker-compose -f local.yml down```
+```docker compose -f local.yml down```
 
-#### To stop a container and remove the volumes
+#### To stop the containers and remove the volumes
 
 The `-v` option will delete any volume data e.g. Postgres data
 
-```docker-compose -f local.yml down -v```
+```docker compose -f local.yml down -v```
 
 #### Open a Django shell:
 
-```docker-compose -f local.yml run django python manage.py shell```
+```docker compose -f local.yml run django python manage.py shell```
 
 ### Open a PostgreSQL shell in local:
 
@@ -158,27 +126,27 @@ e.g.:
 
 (for example `createsuperuser`)
 
-```docker-compose -f local.yml run django python manage.py <command> [arguments]```
+```docker compose -f local.yml run django python manage.py <command> [arguments]```
 
-### 8. Running Tests:
+### 6. Running Tests:
 
 #### Run unit tests:
 
 Note that by adding `--rm` to the commands then the container in which the tests are run is deleted once the tests have finished.
 
-```docker-compose -f local.yml run --rm django pytest```
+```docker compose -f local.yml run --rm django pytest```
 
 #### Run unit tests with coverage:
 
-```docker-compose -f local.yml run --rm django coverage run -m pytest```
+```docker compose -f local.yml run --rm django coverage run -m pytest```
 
 NB to view coverage results,
 
-```docker-compose -f local.yml run --rm django coverage report```
+```docker compose -f local.yml run --rm django coverage report```
 
 which prints a top-level summary to the console. Alternatively for more detail, run
 
-```docker-compose -f local.yml run --rm django coverage html```
+```docker compose -f local.yml run --rm django coverage html```
 
 which creates a local folder `htmlcov`. Browse to the file `index.html` in that folder
 
@@ -193,7 +161,7 @@ or just run the failing test or test class (marked with @pytest.mark.failingtest
 #### Check all of the below together:
 
 ```
-Git add .
+git add .
 pre-commit
 ```
 
@@ -201,29 +169,29 @@ if you get a red Fail message, run both lines again until there are no Fails
 
 #### Check code comprehensively:
 
-```docker-compose -f local.yml run --rm django flake8```
+```docker compose -f local.yml run --rm django flake8```
 
 (no errors means check passed)
 
 #### Check code style only:
 
-```docker-compose -f local.yml run --rm django pycodestyle```
+```docker compose -f local.yml run --rm django pycodestyle```
 
 (no errors means style check passed)
 
 #### Check object types:
 
-```docker-compose -f local.yml run --rm django mypy rard```
+```docker compose -f local.yml run --rm django mypy rard```
 
 #### Fix import order:
 
 The command below will correct the order of your python imports to meet the standard
 
-```docker-compose -f local.yml run --rm django isort .```
+```docker compose -f local.yml run --rm django isort .```
 
 (import order errors when running the flake8 command should be fixed automatically by running the above command)
 
-### 9. Django Migrations
+### 7. Django Migrations
 
 If you make changes to model definitions (i.e. in the `models.py` files) then these need to be reflected in a migration file.
 
@@ -231,21 +199,21 @@ A migration file is a Python 'patch' file generated by Django to apply the chang
 
 If you have made a change to a model and need to generate a migration file:
 
-```docker-compose -f local.yml run django python manage.py makemigrations```
+```docker compose -f local.yml run django python manage.py makemigrations```
 
 You will then either need to restart your container so that these changes are applied:
 
-```docker-compose -f local.yml down```
+```docker compose -f local.yml down```
 
-```docker-compose -f local.yml up```
+```docker compose -f local.yml up```
 
 and these migrations are applied. Alternatively, to apply the latest migrations without restarting the container:
 
-```docker-compose -f local.yml run django python manage.py migrate```
+```docker compose -f local.yml run django python manage.py migrate```
 
 Sometimes migrations cannot be automatically generated, e.g. if two developers have both generated migration files and Django doesn't know which in which order they should be applied. If the two migrations are independent of one another (i.e. relate to different models) then Django can automatically merge these migration files for you by running:
 
-```docker-compose -f local.yml run django python manage.py makemigrations --merge```
+```docker compose -f local.yml run django python manage.py makemigrations --merge```
 
 and following the instructions.
 
@@ -258,26 +226,26 @@ If you have made changes to your models and have not generated a migration file
 
 NB In our case we would run the suggested `manage.py` commands via the Docker container in the way shown above, i.e.
 
-```docker-compose -f local.yml run django python manage.py makemigrations```
+```docker compose -f local.yml run django python manage.py makemigrations```
 
 and
 
-```docker-compose -f local.yml run django python manage.py migrate```
+```docker compose -f local.yml run django python manage.py migrate```
 
 
 If your static files (css, js, fonts etc) have changed then on the production environments you will also need to refresh all of the static files in the deployed static folder.
 
-```docker-compose -f production.yml run django python manage.py collectstatic```
+```docker compose -f production.yml run django python manage.py collectstatic```
 
 Answer 'yes' to the 'are you sure question'. It might say something like '0 files updated' but this message is notoriously misleading. Check to see whether the static files (js etc) being used are the ones you expect.
 
-### 10. Loading data fixtures
+### 8. Loading data fixtures
 
 To take a snapshot of e.g. the production database and install it locally we do the following:
 
 Go to the production machine and run the following command:
 
-```sudo docker-compose -f production.yml run --rm django python manage.py dumpdata --indent=4  --natural-foreign --natural-primary -a  > dump.json```
+```sudo docker compose -f production.yml run --rm django python manage.py dumpdata --indent=4  --natural-foreign --natural-primary -a  > dump.json```
 
 This dumps all (-a) the data in the database into a json file that we can load locally. Check the end of the file to ensure there are no unexpected characters, particularly if you get an error similar to:
 ```
@@ -289,11 +257,11 @@ Now scp the json file to your local machine and run the following commands:
 
 First, remove existing database:
 
-```docker-compose -f local.yml down -v```
+```docker compose -f local.yml down -v```
 
 Rebuild database:
 
-```docker-compose -f local.yml up -d --build```
+```docker compose -f local.yml up -d --build```
 
 Run the `src/loaddata.sh` script to load this:
 
@@ -301,11 +269,11 @@ Run the `src/loaddata.sh` script to load this:
 ./loaddata.sh dump.json
 ```
 
-### 11. Requirements
+### 9. Requirements
 
 Requirements are applied when the containers are built.
 
-### 12. Pre-commit
+### 10. Pre-commit
 
 The requirements file for local development includes pre-commit. To set this up on your machine, make sure you're in the frrant directory and run:
 
diff --git a/src/compose/development/django/Dockerfile b/src/compose/development/django/Dockerfile
index 54acf07c5..e07cccba3 100755
--- a/src/compose/development/django/Dockerfile
+++ b/src/compose/development/django/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.12.12-trixie
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/src/compose/local/django/Dockerfile b/src/compose/local/django/Dockerfile
index 4140a22b4..d1d94c314 100644
--- a/src/compose/local/django/Dockerfile
+++ b/src/compose/local/django/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.12.12-trixie
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/src/compose/local/docs/Dockerfile b/src/compose/local/docs/Dockerfile
index 7736777b3..35c5b4e48 100644
--- a/src/compose/local/docs/Dockerfile
+++ b/src/compose/local/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.12.12-trixie
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/src/compose/production/django/Dockerfile b/src/compose/production/django/Dockerfile
index e81ef9770..ee0372c93 100644
--- a/src/compose/production/django/Dockerfile
+++ b/src/compose/production/django/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.12.12-trixie
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/src/development.yml b/src/development.yml
index 61b04fdaf..369ee260b 100644
--- a/src/development.yml
+++ b/src/development.yml
@@ -1,5 +1,3 @@
-version: '3.3'
-
 volumes:
   development_postgres_data: {}
   development_postgres_data_backups: {}
diff --git a/src/local.yml b/src/local.yml
index 4ee8d8bb8..c2e4629d4 100644
--- a/src/local.yml
+++ b/src/local.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   local_postgres_data: {}
   local_postgres_data_backups: {}
@@ -10,6 +8,7 @@ services:
       context: .
       dockerfile: ./compose/local/django/Dockerfile
     image: rard_local_django
+    pull_policy: never
     container_name: django
     platform: linux/x86_64
     depends_on:
@@ -19,7 +18,7 @@ services:
       - postgres
       - elasticsearch
     volumes:
-      - .:/app:z
+      - .:/app
     env_file:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
@@ -33,15 +32,16 @@ services:
       context: .
       dockerfile: ./compose/development/postgres/Dockerfile
     image: rard_local_postgres
+    pull_policy: never
     container_name: postgres
     platform: linux/x86_64
     volumes:
-      - local_postgres_data:/var/lib/postgresql/data:Z
-      - local_postgres_data_backups:/backups:z
+      - local_postgres_data:/var/lib/postgresql/data
+      - local_postgres_data_backups:/backups
     env_file:
       - ./.envs/.local/.postgres
     ports:
-      - "5432:5432"
+      - "15432:5432"
 
   elasticsearch:
     container_name: elasticsearch
@@ -60,11 +60,12 @@ services:
     build:
       context: .
       dockerfile: ./compose/local/docs/Dockerfile
+    pull_policy: never
     env_file:
       - ./.envs/.local/.django
     volumes:
-      - ./docs:/docs:z
-      - ./config:/app/config:z
-      - ./rard:/app/rard:z
+      - ./docs:/docs
+      - ./config:/app/config
+      - ./rard:/app/rard
     ports:
       - "9000:9000"
diff --git a/src/production.yml b/src/production.yml
index 9224dccd6..2ea31a10b 100644
--- a/src/production.yml
+++ b/src/production.yml
@@ -1,5 +1,3 @@
-version: '3.3'
-
 volumes:
   production_postgres_data: {}
   production_postgres_data_backups: {}
diff --git a/src/requirements/base.txt b/src/requirements/base.txt
index daefe8243..8769d4dfe 100644
--- a/src/requirements/base.txt
+++ b/src/requirements/base.txt
@@ -1,10 +1,10 @@
 pytz==2020.1  # https://github.com/stub42/pytz
 python-slugify==4.0.1  # https://github.com/un33k/python-slugify
-Pillow==7.2.0  # https://github.com/python-pillow/Pillow
+Pillow==12.1.0  # https://github.com/python-pillow/Pillow
 argon2-cffi==20.1.0  # https://github.com/hynek/argon2_cffi
 whitenoise==5.2.0  # https://github.com/evansd/whitenoise
 redis==3.5.3  # https://github.com/andymccurdy/redis-py
-hiredis==1.1.0  # https://github.com/redis/hiredis-py
+hiredis==3.3.0  # https://github.com/redis/hiredis-py
 
 # Django
 # ------------------------------------------------------------------------------
diff --git a/src/requirements/development.txt b/src/requirements/development.txt
index 997688512..af5134cca 100644
--- a/src/requirements/development.txt
+++ b/src/requirements/development.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.11  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 
 # Django
diff --git a/src/requirements/local.txt b/src/requirements/local.txt
index a6a34f252..a56fe9c5b 100644
--- a/src/requirements/local.txt
+++ b/src/requirements/local.txt
@@ -2,12 +2,12 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.3  # https://github.com/gotcha/ipdb
-psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.11  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.770  # https://github.com/python/mypy
-django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
+mypy==1.19.1  # https://github.com/python/mypy
+django-stubs==5.2.9  # https://github.com/typeddjango/django-stubs
 pytest==6.0.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
@@ -21,7 +21,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.2.1  # https://github.com/nedbat/coveragepy
-black==20.8b1  # https://github.com/ambv/black
+black==26.1.0  # https://github.com/ambv/black
 pylint-django==2.3.0  # https://github.com/PyCQA/pylint-django
 pre-commit==2.20.0  # https://github.com/pre-commit/pre-commit
 debugpy==1.6.7  # https://github.com/microsoft/debugpy
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
index 588acb66e..e2f11844a 100644
--- a/src/requirements/production.txt
+++ b/src/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.11  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 
 # Django

From 90191cf2c8da18f61c0b15d2df9494ef5547db96 Mon Sep 17 00:00:00 2001
From: Tim Band <t.b@ucl>
Date: Fri, 23 Jan 2026 15:48:35 +0000
Subject: [PATCH 2/6] Upgraded pytest

---
 src/requirements/local.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/requirements/local.txt b/src/requirements/local.txt
index a56fe9c5b..f82d5c970 100644
--- a/src/requirements/local.txt
+++ b/src/requirements/local.txt
@@ -8,8 +8,8 @@ psycopg2==2.9.11  # https://github.com/psycopg/psycopg2
 # ------------------------------------------------------------------------------
 mypy==1.19.1  # https://github.com/python/mypy
 django-stubs==5.2.9  # https://github.com/typeddjango/django-stubs
-pytest==6.0.1  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
+pytest==9.0.2  # https://github.com/pytest-dev/pytest
+pytest-sugar==1.1.1  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation
 # ------------------------------------------------------------------------------
@@ -33,7 +33,7 @@ factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.8  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.11.1  # https://github.com/pytest-dev/pytest-django
 
 # Overrides
 # ------------------------------------------------------------------------------

From 7ac37b7c8a31b39ccdcb0835bf7efb8b5a2ca81d Mon Sep 17 00:00:00 2001
From: Tim Band <t.b@ucl>
Date: Wed, 28 Jan 2026 16:21:25 +0000
Subject: [PATCH 3/6] manage script

---
 README.md  | 18 +++++++++---------
 src/manage |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100755 src/manage

diff --git a/README.md b/README.md
index 02cda3812..0bd6cd4fb 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ The `-v` option will delete any volume data e.g. Postgres data
 
 #### Open a Django shell:
 
-```docker compose -f local.yml run django python manage.py shell```
+```./manage shell```
 
 ### Open a PostgreSQL shell in local:
 
@@ -126,7 +126,7 @@ e.g.:
 
 (for example `createsuperuser`)
 
-```docker compose -f local.yml run django python manage.py <command> [arguments]```
+```./manage <command> [arguments]```
 
 ### 6. Running Tests:
 
@@ -199,21 +199,21 @@ A migration file is a Python 'patch' file generated by Django to apply the chang
 
 If you have made a change to a model and need to generate a migration file:
 
-```docker compose -f local.yml run django python manage.py makemigrations```
+```./manage makemigrations```
 
 You will then either need to restart your container so that these changes are applied:
 
 ```docker compose -f local.yml down```
 
-```docker compose -f local.yml up```
+```docker compose -f local.yml up -d```
 
 and these migrations are applied. Alternatively, to apply the latest migrations without restarting the container:
 
-```docker compose -f local.yml run django python manage.py migrate```
+```./manage migrate```
 
 Sometimes migrations cannot be automatically generated, e.g. if two developers have both generated migration files and Django doesn't know which in which order they should be applied. If the two migrations are independent of one another (i.e. relate to different models) then Django can automatically merge these migration files for you by running:
 
-```docker compose -f local.yml run django python manage.py makemigrations --merge```
+```./manage makemigrations --merge```
 
 and following the instructions.
 
@@ -226,16 +226,16 @@ If you have made changes to your models and have not generated a migration file
 
 NB In our case we would run the suggested `manage.py` commands via the Docker container in the way shown above, i.e.
 
-```docker compose -f local.yml run django python manage.py makemigrations```
+```./manage makemigrations```
 
 and
 
-```docker compose -f local.yml run django python manage.py migrate```
+```./manage migrate```
 
 
 If your static files (css, js, fonts etc) have changed then on the production environments you will also need to refresh all of the static files in the deployed static folder.
 
-```docker compose -f production.yml run django python manage.py collectstatic```
+```docker compose -f production.yml run --rm django python manage.py collectstatic```
 
 Answer 'yes' to the 'are you sure question'. It might say something like '0 files updated' but this message is notoriously misleading. Check to see whether the static files (js etc) being used are the ones you expect.
 
diff --git a/src/manage b/src/manage
new file mode 100755
index 000000000..1275708bf
--- /dev/null
+++ b/src/manage
@@ -0,0 +1 @@
+docker compose -f local.yml run --rm django python manage.py $@

From 0fb00a41c81187ea0bc71581c325f6016fe5af1a Mon Sep 17 00:00:00 2001
From: Tim Band <t.b@ucl>
Date: Thu, 12 Mar 2026 13:44:07 +0000
Subject: [PATCH 4/6] Explain manage and provide manage.bat

---
 README.md      | 13 +++++++++++++
 src/manage.bat |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 src/manage.bat

diff --git a/README.md b/README.md
index 0bd6cd4fb..d8799304f 100644
--- a/README.md
+++ b/README.md
@@ -111,8 +111,19 @@ The `-v` option will delete any volume data e.g. Postgres data
 
 #### Open a Django shell:
 
+A couple of useful shell scripts, `manage` (for Linux and Mac) and `manage.bat` (for Windows)
+have been provided in the `src` directory.
+These can be used like the standard `manage.py` script provided by Django,
+but inside the local Docker compose network.
+
+So, from the `src` directory, on Linux or Mac you can run:
+
 ```./manage shell```
 
+Or at a Windows command prompt equivalently:
+
+```manage.bat shell```
+
 ### Open a PostgreSQL shell in local:
 
 ```docker compose -f local.yml exec postgres psql -d rard -U ftTUlBrLLgvsMhazNCenkVazbscHpykq```
@@ -128,6 +139,8 @@ e.g.:
 
 ```./manage <command> [arguments]```
 
+(or `manage.bat` on Windows)
+
 ### 6. Running Tests:
 
 #### Run unit tests:
diff --git a/src/manage.bat b/src/manage.bat
new file mode 100644
index 000000000..e30249df3
--- /dev/null
+++ b/src/manage.bat
@@ -0,0 +1 @@
+@docker compose -f local.yml run --rm django python manage.py %*

From 31b5a903cb5eb1573634b0545aeb4e5ad1e64a02 Mon Sep 17 00:00:00 2001
From: Tim Band <t.b@ucl>
Date: Mon, 16 Mar 2026 12:50:50 +0000
Subject: [PATCH 5/6] remove Postgres external port

---
 src/local.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/local.yml b/src/local.yml
index c2e4629d4..5da838030 100644
--- a/src/local.yml
+++ b/src/local.yml
@@ -40,8 +40,6 @@ services:
       - local_postgres_data_backups:/backups
     env_file:
       - ./.envs/.local/.postgres
-    ports:
-      - "15432:5432"
 
   elasticsearch:
     container_name: elasticsearch

From a471252988b80811c8b03fa39f9f52f2ed07e5ea Mon Sep 17 00:00:00 2001
From: Tim Band <t.b@ucl>
Date: Mon, 16 Mar 2026 14:07:08 +0000
Subject: [PATCH 6/6] manage script uses current user

---
 src/manage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/manage b/src/manage
index 1275708bf..b6e8275bd 100755
--- a/src/manage
+++ b/src/manage
@@ -1 +1 @@
-docker compose -f local.yml run --rm django python manage.py $@
+docker compose -f local.yml run --user="$(id -u):$(id -g)" --rm django python manage.py $@