From 3b73a729be95b97fda286cd710234a97d41ec848 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Fri, 31 Oct 2025 19:00:28 +0100
Subject: [PATCH] Docker: updates

---
 docker/rocky8/Dockerfile     | 5 +++--
 docker/rocky9/Dockerfile     | 3 ++-
 docker/ubuntu2204/Dockerfile | 2 +-
 docker/ubuntu2404/Dockerfile | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile
index 56888466..ac219bf3 100644
--- a/docker/rocky8/Dockerfile
+++ b/docker/rocky8/Dockerfile
@@ -53,6 +53,7 @@ RUN dnf -y update && \
       mesa-libEGL-devel \
       dbus-devel \
       zlib-devel \
+      zlib-static \
       glib2-devel \
       fftw-static \
       fftw-devel \
@@ -166,7 +167,7 @@ RUN set -eux; \
     rm -rf /tmp/hdf5-src
 
 ENV CMAKE_PREFIX_PATH=/opt/libtiff-${LIBTIFF_VERSION}-static:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static
-ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_TAG}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_TAG}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
+ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_VERSION}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
 
 ARG QT_PREFIX=/opt/qt-${QT_VERSION}-static
 RUN set -eux; \
@@ -200,7 +201,7 @@ RUN set -eux; \
     cmake --install .; \
     cd /; rm -rf /tmp/qt-everywhere-src-${QT_VERSION} /tmp/qt-everywhere-src-${QT_VERSION}.tar.xz
 
-ENV CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/opt/hdf5-${HDF5_TAG}-static:opt/qt-${QT_VERSION}-static:/opt/eigen
+ENV CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/opt/hdf5-${HDF5_TAG}-static:/opt/qt-${QT_VERSION}-static:/opt/eigen
 
 # Set workdir for your project
 WORKDIR /workspace
diff --git a/docker/rocky9/Dockerfile b/docker/rocky9/Dockerfile
index 78712127..004acb46 100644
--- a/docker/rocky9/Dockerfile
+++ b/docker/rocky9/Dockerfile
@@ -54,6 +54,7 @@ RUN dnf -y update && \
       mesa-libEGL-devel \
       dbus-devel \
       zlib-devel \
+      zlib-static \
       glib2-devel \
       fftw-static \
       fftw-devel \
@@ -148,7 +149,7 @@ RUN set -eux; \
     rm -rf /tmp/hdf5-src
 
 ENV CMAKE_PREFIX_PATH=/opt/libtiff-${LIBTIFF_VERSION}-static:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static
-ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_TAG}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_TAG}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
+ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_VERSION}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
 
 # Make GCC/G++ 13 the default for builds
 ENV GCC_TOOLSET_ROOT=/opt/rh/gcc-toolset-13/root
diff --git a/docker/ubuntu2204/Dockerfile b/docker/ubuntu2204/Dockerfile
index 3b39e456..b2d91410 100644
--- a/docker/ubuntu2204/Dockerfile
+++ b/docker/ubuntu2204/Dockerfile
@@ -166,7 +166,7 @@ RUN set -eux; \
 
 
 ENV CMAKE_PREFIX_PATH=/opt/libtiff-${LIBTIFF_VERSION}-static:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static
-ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_TAG}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_TAG}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
+ENV PKG_CONFIG_PATH=/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig:/opt/libjpeg-turbo-${LIBJPEG_TURBO_VERSION}-static/lib/pkgconfig:/opt/libtiff-${LIBTIFF_VERSION}-static/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig
 
 # Use GCC/G++ 12 for builds
 ENV CC=/usr/bin/gcc-12
diff --git a/docker/ubuntu2404/Dockerfile b/docker/ubuntu2404/Dockerfile
index 7ea733e5..7a6d69db 100644
--- a/docker/ubuntu2404/Dockerfile
+++ b/docker/ubuntu2404/Dockerfile
@@ -120,7 +120,8 @@ RUN set -eux; \
 
 # Expose static OpenSSL to CMake/pkg-config
 ENV OPENSSL_ROOT_DIR=/opt/openssl-${OPENSSL_VERSION}
-ENV PKG_CONFIG_PATH=${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig:/opt/hdf5-${HDF5_TAG}-static
+ENV CMAKE_PROFILE_PATH=/opt/hdf5-${HDF5_TAG}-static:${OPENSSL_ROOT_DIR}
+ENV PKG_CONFIG_PATH=${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/pkgconfig:/opt/hdf5-${HDF5_TAG}-static/lib/pkgconfig
 
 # Set workdir for your project
 WORKDIR /workspace