From 048416898ec2ac2c1732a37c9b5b089962811eac Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Tue, 16 Sep 2025 21:18:52 +0200
Subject: [PATCH] Fixes (WIP... very much in progress)

---
 .gitea/workflows/rpm.yml     | 11 +++++------
 docker/rocky8/Dockerfile     |  2 ++
 docker/ubuntu2204/Dockerfile |  1 +
 docker/ubuntu2404/Dockerfile |  1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/rpm.yml b/.gitea/workflows/rpm.yml
index 06a04fba..578bfafe 100644
--- a/.gitea/workflows/rpm.yml
+++ b/.gitea/workflows/rpm.yml
@@ -37,9 +37,9 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_flags }} ..
-          make frontend
-          make -j16 package
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_flags }} ..
+          ninja frontend
+          ninja -j16 package
           shopt -s nullglob
           files=( *.rpm *.deb )
           if (( ${#files[@]} )); then
@@ -59,7 +59,6 @@ jobs:
   unit-tests:
     name: Unit tests
     runs-on: jfjoch_rocky8
-    needs: [build-rpm]
     timeout-minutes: 90
     env:
       CTEST_OUTPUT_ON_FAILURE: '1'
@@ -70,8 +69,8 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release ..
-          make -j48 jfjoch_test jfjoch_hdf5_test
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+          ninja -j48 jfjoch_test jfjoch_hdf5_test
       - name: Run unit tests
         shell: bash
         run: |
diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile
index 22525519..1509c56e 100644
--- a/docker/rocky8/Dockerfile
+++ b/docker/rocky8/Dockerfile
@@ -46,6 +46,8 @@ RUN dnf -y update && \
       fontconfig-devel \
       openssl-static \
       zlib-static \
+      java-21-openjdk-headless \
+      java-21-openjdk-devel \
       freetype-devel && \
     dnf clean all && rm -rf /var/cache/dnf
 
diff --git a/docker/ubuntu2204/Dockerfile b/docker/ubuntu2204/Dockerfile
index c5f84a35..21f01d35 100644
--- a/docker/ubuntu2204/Dockerfile
+++ b/docker/ubuntu2204/Dockerfile
@@ -24,6 +24,7 @@ RUN set -eux; \
       perl \
       pkg-config \
       gdb \
+      file \
       dpkg-dev \
       fakeroot \
       libnuma-dev \
diff --git a/docker/ubuntu2404/Dockerfile b/docker/ubuntu2404/Dockerfile
index bd1f688e..a32a4277 100644
--- a/docker/ubuntu2404/Dockerfile
+++ b/docker/ubuntu2404/Dockerfile
@@ -22,6 +22,7 @@ RUN set -eux; \
       perl \
       pkg-config \
       gdb \
+      file \
       dpkg-dev \
       fakeroot \
       libnuma-dev \