Refactor docker dependencies and Trilinos version

maxfirmbach · maxfirmbach · commit c888bf2ff640 · 2025-07-04T20:15:46.000+02:00
diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml
@@ -16,7 +16,7 @@ jobs:
   gcc13_assertions_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref != 'refs/heads/main'
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -102,7 +102,7 @@ jobs:
   clang18_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -146,7 +146,7 @@ jobs:
     needs: clang18_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -172,7 +172,7 @@ jobs:
     needs: clang18_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -224,7 +224,7 @@ jobs:
   gcc13_no_optional_dependencies_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -248,7 +248,7 @@ jobs:
     needs: gcc13_no_optional_dependencies_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
diff --git a/.github/workflows/checkcode.yml b/.github/workflows/checkcode.yml
@@ -29,7 +29,7 @@ jobs:
   clang-tidy:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -53,7 +53,7 @@ jobs:
   verify-headers:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -8,7 +8,7 @@ jobs:
   gcc13_coverage_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -41,7 +41,7 @@ jobs:
     needs: gcc13_coverage_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       matrix:
@@ -107,7 +107,7 @@ jobs:
     needs: [gcc13_coverage_test, gcc13_coverage_build]
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -18,7 +18,7 @@ jobs:
   doxygen:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -44,7 +44,7 @@ jobs:
   documentation:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
diff --git a/.github/workflows/nightly_tests.yml b/.github/workflows/nightly_tests.yml
@@ -8,7 +8,7 @@ jobs:
   gcc13_assertions_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -41,7 +41,7 @@ jobs:
     needs: gcc13_assertions_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -93,7 +93,7 @@ jobs:
   clang18_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -191,7 +191,7 @@ jobs:
     needs: clang18_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -243,7 +243,7 @@ jobs:
   clang18_build_oldest_supported_dependencies:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -276,7 +276,7 @@ jobs:
     needs: clang18_build_oldest_supported_dependencies
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -315,7 +315,7 @@ jobs:
   gcc13_no_optional_dependencies_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -348,7 +348,7 @@ jobs:
     needs: gcc13_no_optional_dependencies_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -400,7 +400,7 @@ jobs:
   gcc13_asan_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -433,7 +433,7 @@ jobs:
     needs: gcc13_asan_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:8115e93e
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:f3b2931d
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
diff --git a/dependencies/current/qhull/install.sh b/dependencies/current/qhull/install.sh
diff --git a/dependencies/current/suitesparse/install.sh b/dependencies/current/suitesparse/install.sh
diff --git a/dependencies/current/trilinos/install.sh b/dependencies/current/trilinos/install.sh
@@ -17,7 +17,7 @@ INSTALL_DIR="$1"
 # Number of procs for building (default 4)
 NPROCS=${NPROCS:=4}
 # git sha from Trilinos repository:
-VERSION="06db4c850654feacabdaed61ee8308219266b6a5"
+VERSION="ff9c94e50ea889848ceaa3ce6598e81c3996fcfb"
 #CHECKSUM=""
 
 
@@ -99,8 +99,7 @@ $CMAKE_COMMAND \
     -D ParMETIS_INCLUDE_DIRS:PATH="/usr/include" \
     -D ParMETIS_LIBRARY_DIRS:PATH="/usr/lib/libparmetis.so.4.0.3" \
   -D TPL_ENABLE_UMFPACK:BOOL=ON \
-    -D UMFPACK_INCLUDE_DIRS:FILEPATH="$INSTALL_DIR/include" \
-    -D UMFPACK_LIBRARY_DIRS:FILEPATH="$INSTALL_DIR/lib" \
+    -D UMFPACK_INCLUDE_DIRS:FILEPATH="/usr/include/suitesparse" \
   -D TPL_ENABLE_SuperLUDist:BOOL=ON \
     -D SuperLUDist_INCLUDE_DIRS:PATH="$INSTALL_DIR/include" \
     -D SuperLUDist_LIBRARY_DIRS:PATH="$INSTALL_DIR/lib" \
diff --git a/dependencies/oldest_supported/trilinos/install.sh b/dependencies/oldest_supported/trilinos/install.sh
@@ -101,8 +101,7 @@ $CMAKE_COMMAND \
     -D ParMETIS_INCLUDE_DIRS:PATH="/usr/include" \
     -D ParMETIS_LIBRARY_DIRS:PATH="/usr/lib/libparmetis.so.4.0.3" \
   -D TPL_ENABLE_UMFPACK:BOOL=ON \
-    -D UMFPACK_INCLUDE_DIRS:FILEPATH="$INSTALL_DIR/include" \
-    -D UMFPACK_LIBRARY_DIRS:FILEPATH="$INSTALL_DIR/lib" \
+    -D UMFPACK_INCLUDE_DIRS:FILEPATH="/usr/include/suitesparse" \
   -D TPL_ENABLE_SuperLUDist:BOOL=ON \
     -D SuperLUDist_INCLUDE_DIRS:PATH="$INSTALL_DIR/include" \
     -D SuperLUDist_LIBRARY_DIRS:PATH="$INSTALL_DIR/lib" \
diff --git a/dependencies/supported_version/Trilinos.txt b/dependencies/supported_version/Trilinos.txt
@@ -1,3 +1,4 @@
+ff9c94e50ea889848ceaa3ce6598e81c3996fcfb 2025.5 none
 06db4c850654feacabdaed61ee8308219266b6a5 2025.4 none
 8cdf0375d278598c12edc3fd7059cb133c6f4426 2025.3 16.2.0
 11a16481fa1af48e3cfdb0aa84c29617ce94479f 2025.2 16.1.0
diff --git a/dependencies/trilinos_develop/trilinos/install.sh b/dependencies/trilinos_develop/trilinos/install.sh
@@ -99,8 +99,7 @@ $CMAKE_COMMAND \
     -D ParMETIS_INCLUDE_DIRS:PATH="/usr/include" \
     -D ParMETIS_LIBRARY_DIRS:PATH="/usr/lib/libparmetis.so.4.0.3" \
   -D TPL_ENABLE_UMFPACK:BOOL=ON \
-    -D UMFPACK_INCLUDE_DIRS:FILEPATH="$INSTALL_DIR/include" \
-    -D UMFPACK_LIBRARY_DIRS:FILEPATH="$INSTALL_DIR/lib" \
+    -D UMFPACK_INCLUDE_DIRS:FILEPATH="/usr/include/suitesparse" \
   -D TPL_ENABLE_SuperLUDist:BOOL=ON \
     -D SuperLUDist_INCLUDE_DIRS:PATH="$INSTALL_DIR/include" \
     -D SuperLUDist_LIBRARY_DIRS:PATH="$INSTALL_DIR/lib" \
diff --git a/docker/dependencies/Dockerfile b/docker/dependencies/Dockerfile
@@ -61,6 +61,8 @@ RUN apt-get update && apt-get install -y \
       clang-tidy \
       clang-tools \
       libomp-dev \
+      libqhull-dev \
+      libsuitesparse-dev \
   && rm -rf /var/lib/apt/lists/*
 
 # Create directory for dependencies
@@ -73,15 +75,9 @@ COPY dependencies /dependencies
 # Install cmake
 RUN /dependencies/current/cmake/install.sh /usr/local
 
-# Install SuiteSparse 5.4.0
-RUN /dependencies/current/suitesparse/install.sh ${INSTALL_DIR}
-
 # Install superLU_dist 7.2.0
 RUN /dependencies/current/superlu_dist/install.sh ${INSTALL_DIR}
 
-# Install qhull 2012.1
-RUN /dependencies/current/qhull/install.sh ${INSTALL_DIR}
-
 # Install Trilinos 2022_Q1
 RUN /dependencies/current/trilinos/install.sh ${INSTALL_DIR}
 
diff --git a/docker/oldest_supported/Dockerfile b/docker/oldest_supported/Dockerfile
@@ -62,6 +62,8 @@ RUN apt-get update && apt-get install -y \
       clang-tidy \
       clang-tools \
       libomp-dev \
+      libqhull-dev \
+      libsuitesparse-dev \
   && rm -rf /var/lib/apt/lists/*
 
 # Create directory for dependencies
@@ -74,15 +76,9 @@ COPY dependencies /dependencies
 # Install cmake
 RUN /dependencies/current/cmake/install.sh /usr/local
 
-# Install SuiteSparse 5.4.0
-RUN /dependencies/current/suitesparse/install.sh ${INSTALL_DIR}
-
 # Install superLU_dist 7.2.0
 RUN /dependencies/current/superlu_dist/install.sh ${INSTALL_DIR}
 
-# Install qhull 2012.1
-RUN /dependencies/current/qhull/install.sh ${INSTALL_DIR}
-
 # Install Trilinos
 RUN /dependencies/oldest_supported/trilinos/install.sh ${INSTALL_DIR}
 
diff --git a/docker/trilinos_develop/Dockerfile b/docker/trilinos_develop/Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+ff9c94e50ea889848ceaa3ce6598e81c3996fcfb 2025.5 none`
`1`	`2`	`06db4c850654feacabdaed61ee8308219266b6a5 2025.4 none`
`2`	`3`	`8cdf0375d278598c12edc3fd7059cb133c6f4426 2025.3 16.2.0`
`3`	`4`	`11a16481fa1af48e3cfdb0aa84c29617ce94479f 2025.2 16.1.0`