Merge pull request #378 from ucam-department-of-psychiatry/docker-update

Update the Docker image to Debian 11
ucam-department-of-psychiatry · Sep 11, 2024 · 45a665e · 45a665e
2 parents 9a1d2cd + 110cec4
commit 45a665e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 34 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -3951,3 +3951,5 @@ Current C++/SQLite client, Python/SQLAlchemy server
 
 **Client and server v2.4.22, IN PROGRESS**
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Update the Docker image to use Debian 11. Debian 10 has now reached end-of-life.
diff --git a/docs/source/developer/versions.rst b/docs/source/developer/versions.rst
@@ -23,34 +23,37 @@
 Versions of software etc. used by CamCOPS
 =========================================
 
-+--------------+---------+-----------------------------------------------------+
-| Name | Version | Supported until  |
++----------------+---------+---------------------------------------------------+
+| Name  | Version | Supported until |
 +==============+=========+=====================================================+
-| Eigen | 3.4.0 | ?. Last release was 2021-08-18 and there is more |
-| | | recent activity at |
-| | | https://gitlab.com/libeigen/eigen |
-+--------------+---------+-----------------------------------------------------+
-| FFmpeg | 6.0 | ?; https://endoflife.date/ffmpeg |
-+--------------+---------+-----------------------------------------------------+
-| OpenSSL | 3.0.x | 2026-09-07 (LTS); |
-| | | https://www.openssl.org/policies/releasestrat.html |
-+--------------+---------+-----------------------------------------------------+
-| Python | 3.8 | 2023-08-24 |
-+--------------+---------+-----------------------------------------------------+
-| | 3.9 | 2025-10-05 |
-+--------------+---------+-----------------------------------------------------+
-| | 3.10 | 2026-10-04; |
-| | | https://devguide.python.org/versions/ |
-+--------------+---------+-----------------------------------------------------+
-| Qt | 6.5.x | 2026-03-31 (LTS) but 6.5.x branch now |
-| | | commercial-only with delayed open source release. |
-| | | Latest non-commercial, non-LTS release is 6.6. |
-| | | https://endoflife.date/qt |
-+--------------+---------+-----------------------------------------------------+
-| SQLAlchemy | 1.4 | Still maintained but will reach EOL when 2.1 |
-| | | becomes the next major release. |
-| | | Upgrade to 2.0 is encouraged. |
-| | | https://www.sqlalchemy.org/download.html |
-+--------------+---------+-----------------------------------------------------+
-| SQL Cipher | 4.5.5 | ?; based on SQLite 3.42.0 |
-+--------------+---------+-----------------------------------------------------+
+| Debian | 11 | 2026-08-31; |
+| (Docker image) | | https://wiki.debian.org/LTS |
++----------------+---------+---------------------------------------------------+
+| Eigen | 3.4.0 | ?. Last release was 2021-08-18 and there is more |
+| | | recent activity at |
+| | | https://gitlab.com/libeigen/eigen |
++----------------+---------+---------------------------------------------------+
+| FFmpeg | 6.0 | ?; https://endoflife.date/ffmpeg |
++----------------+---------+---------------------------------------------------+
+| OpenSSL | 3.0.x | 2026-09-07 (LTS); |
+| | | https://www.openssl.org/policies/releasestrat.html|
++----------------+---------+---------------------------------------------------+
+| Python | 3.8 | 2023-08-24 |
++----------------+---------+---------------------------------------------------+
+| | 3.9 | 2025-10-05 |
++----------------+---------+---------------------------------------------------+
+| | 3.10 | 2026-10-04; |
+| | | https://devguide.python.org/versions/ |
++----------------+---------+---------------------------------------------------+
+| Qt | 6.5.x | 2026-03-31 (LTS) but 6.5.x branch now |
+| | | commercial-only with delayed open source release. |
+| | | Latest non-commercial, non-LTS release is 6.6. |
+| | | https://endoflife.date/qt |
++----------------+---------+---------------------------------------------------+
+| SQLAlchemy | 1.4 | Still maintained but will reach EOL when 2.1 |
+| | | becomes the next major release. |
+| | | Upgrade to 2.0 is encouraged. |
+| | | https://www.sqlalchemy.org/download.html |
++----------------+---------+---------------------------------------------------+
+| SQL Cipher | 4.5.5 | ?; based on SQLite 3.42.0 |
++----------------+---------+---------------------------------------------------+
diff --git a/server/docker/dockerfiles/camcops.Dockerfile b/server/docker/dockerfiles/camcops.Dockerfile
@@ -19,9 +19,9 @@
 # - ubuntu:18.04? Requires "apt install python3" or similar? Quite tricky.
 # Also larger.
 
-FROM python:3.9-slim-buster
+FROM python:3.9-slim-bullseye
 
-# ... note that "-buster" (not "-slim-buster") includes some things we need,
+# ... note that "-bullseye" (not "-slim-bullseye") includes some things we need,
 # but is LARGER overall.
 
 # -----------------------------------------------------------------------------
@@ -82,7 +82,7 @@ WORKDIR /camcops
 # setup.py
 # - libmagickwand-dev: ImageMagick, used by CamCOPS
 # - libmysqlclient-dev: for MySQL access (needed by Python mysqlclient package)
-# ... replaced by libmariadbclient-dev in Debian 10
+# ... replaced by libmariadb-dev in Debian 11
 # - wget: for fetching other stuff! See below.
 # - wait-for-it: wait for a host/TCP port (to synchronize containers)
 #
@@ -146,7 +146,7 @@ RUN echo "- Updating package information..." \
  wait-for-it \
  \
  libmagickwand-dev \
- libmariadbclient-dev \
+ libmariadb-dev \
  && echo "- wkhtmltopdf: Fetching wkhtmltopdf with patched Qt..." \
  && wget -O /tmp/wkhtmltopdf.deb \
  https:/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \