From a4cedc75ff37d42e29d41550eb80ad5649ba402e Mon Sep 17 00:00:00 2001
From: RS <rs@mage.me.uk>
Date: Wed, 13 Aug 2025 08:13:51 +0000
Subject: [PATCH] Update docker image to use Ubuntu's current LTS and fix
 ghostscript warning

---
 Dockerfile | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0afc8d8..6ac81d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Use official Ubuntu image
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 # Install dependencies
 RUN apt-get update && \
@@ -13,7 +13,7 @@ RUN apt-get update && \
     lldb \
     python3 \
     python3-pip \
-    python3-jinja2 \
+    python3-venv \
     clang \
     clang-tidy \
     lcov \
@@ -22,9 +22,20 @@ RUN apt-get update && \
     libpsl-dev \
     sudo \
     pkg-config \
+    ghostscript \
     && apt-get clean
 
-RUN pip3 install clang-format==14.0.6 cmake_format==0.6.11 pyyaml
+# Create and activate a virtual environment for Python tools
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-# Load shell.
+# Set CLANG_FORMAT_EXECUTABLE environment variable to use clang-format from the venv
+RUN ln -s /opt/venv/bin/clang-format /usr/local/bin/clang-format
+
+# Upgrade pip and install Python packages in venv
+RUN pip install --upgrade pip && \
+    pip install clang-format==14.0.6 cmake_format==0.6.11 pyyaml jinja2 pygments
+
+# Load shell
 CMD ["/bin/bash"]