From 839475f47afea59c99cdb9e0e080e96b8090022e Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Sat, 25 Oct 2025 11:13:03 +0200
Subject: [PATCH] Docker: Update docker images

---
 docker/rocky8/Dockerfile     | 9 ++++++++-
 docker/rocky9/Dockerfile     | 9 ++++++++-
 docker/ubuntu2204/Dockerfile | 9 ++++++++-
 docker/ubuntu2404/Dockerfile | 1 +
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile
index 7e23306c..c036e11e 100644
--- a/docker/rocky8/Dockerfile
+++ b/docker/rocky8/Dockerfile
@@ -63,6 +63,9 @@ RUN dnf -y update && \
       twine \
       openblas \
       openblas-devel \
+      assimp-devel \
+      mesa-dri-drivers \
+      libdrm-devel \
       freetype-devel && \
     dnf clean all && rm -rf /var/cache/dnf
 
@@ -107,7 +110,7 @@ RUN set -eux; \
     tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
     mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
     cmake -G Ninja \
-      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts" \
+      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
       -DBUILD_SHARED_LIBS=OFF \
       -DQT_BUILD_TESTS=OFF \
       -DQT_BUILD_EXAMPLES=OFF \
@@ -115,6 +118,10 @@ RUN set -eux; \
       -DQT_FEATURE_xcb=ON \
       -DQT_FEATURE_xcb_xlib=ON \
       -DQT_FEATURE_xkbcommon_x11=ON \
+      -DQT_FEATURE_opengl=ON \
+      -DQT_FEATURE_opengl_desktop=ON \
+      -DQT_FEATURE_opengl_dynamic=ON \
+      -DQT_FEATURE_vulkan=OFF \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
       -DCMAKE_C_COMPILER=${CC} \
diff --git a/docker/rocky9/Dockerfile b/docker/rocky9/Dockerfile
index cfd74a02..15d3feb9 100644
--- a/docker/rocky9/Dockerfile
+++ b/docker/rocky9/Dockerfile
@@ -58,6 +58,9 @@ RUN dnf -y update && \
       fontconfig-devel \
       openblas-devel \
       openblas-serial \
+      assimp-devel \
+      mesa-dri-drivers \
+      libdrm-devel \
       freetype-devel && \
     dnf clean all && rm -rf /var/cache/dnf
 
@@ -95,7 +98,7 @@ RUN set -eux; \
     tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
     mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
     cmake -G Ninja \
-      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts" \
+      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
       -DBUILD_SHARED_LIBS=OFF \
       -DQT_BUILD_TESTS=OFF \
       -DQT_BUILD_EXAMPLES=OFF \
@@ -103,6 +106,10 @@ RUN set -eux; \
       -DQT_FEATURE_xcb=ON \
       -DQT_FEATURE_xcb_xlib=ON \
       -DQT_FEATURE_xkbcommon_x11=ON \
+      -DQT_FEATURE_opengl=ON \
+      -DQT_FEATURE_opengl_desktop=ON \
+      -DQT_FEATURE_opengl_dynamic=ON \
+      -DQT_FEATURE_vulkan=OFF \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
       -DCMAKE_C_COMPILER=${CC} \
diff --git a/docker/ubuntu2204/Dockerfile b/docker/ubuntu2204/Dockerfile
index 1436fba3..c2894cab 100644
--- a/docker/ubuntu2204/Dockerfile
+++ b/docker/ubuntu2204/Dockerfile
@@ -67,6 +67,9 @@ RUN set -eux; \
       libopenblas-dev \
       libfftw3-dev \
       libeigen3-dev \
+      libdrm-dev \
+      mesa-utils \
+      libassimp-dev \
       libfreetype6-dev; \
     apt-get -y install gcc-12 g++-12; \
     apt-get clean; \
@@ -109,7 +112,7 @@ RUN set -eux; \
     tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
     mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
     cmake -G Ninja \
-      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts" \
+      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
       -DBUILD_SHARED_LIBS=OFF \
       -DQT_BUILD_TESTS=OFF \
       -DQT_BUILD_EXAMPLES=OFF \
@@ -117,6 +120,10 @@ RUN set -eux; \
       -DQT_FEATURE_xcb=ON \
       -DQT_FEATURE_xcb_xlib=ON \
       -DQT_FEATURE_xkbcommon_x11=ON \
+      -DQT_FEATURE_opengl=ON \
+      -DQT_FEATURE_opengl_desktop=ON \
+      -DQT_FEATURE_opengl_dynamic=ON \
+      -DQT_FEATURE_vulkan=OFF \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
       -DCMAKE_C_COMPILER=${CC} \
diff --git a/docker/ubuntu2404/Dockerfile b/docker/ubuntu2404/Dockerfile
index a19446e3..b945be99 100644
--- a/docker/ubuntu2404/Dockerfile
+++ b/docker/ubuntu2404/Dockerfile
@@ -67,6 +67,7 @@ RUN set -eux; \
       qt6-base-dev \
       qt6-charts-dev \
       qt6-tools-dev \
+      qt6-3d-dev \
       libeigen3-dev \
       libfreetype6-dev; \
     apt-get clean; \