Skip to content

Commit 4568163

Browse files
maxfirmbachmaxfirmbach
authored
Merge pull request #1950 from 4C-multiphysics/docker-update-get-qhull-from-apt
[Qhull] Install with apt
2 parents a10538b + 81d4f4d commit 4568163

File tree

14 files changed

+251
-294
lines changed

14 files changed

+251
-294
lines changed

‎.github/workflows/buildtest.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
gcc13_assertions_build:
1717
runs-on: ubuntu-latest
1818
container:
19-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
19+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
2020
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
2121
defaults:
2222
run:
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
if: github.ref != 'refs/heads/main'
5454
container:
55-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
55+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
5656
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
5757
strategy:
5858
fail-fast: false
@@ -104,7 +104,7 @@ jobs:
104104
clang18_build:
105105
runs-on: ubuntu-latest
106106
container:
107-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
107+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
108108
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
109109
defaults:
110110
run:
@@ -158,7 +158,7 @@ jobs:
158158
needs: clang18_build
159159
runs-on: ubuntu-latest
160160
container:
161-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
161+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
162162
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
163163
defaults:
164164
run:
@@ -184,7 +184,7 @@ jobs:
184184
needs: clang18_build
185185
runs-on: ubuntu-latest
186186
container:
187-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
187+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
188188
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
189189
defaults:
190190
run:
@@ -243,7 +243,7 @@ jobs:
243243
gcc13_no_optional_dependencies_build:
244244
runs-on: ubuntu-latest
245245
container:
246-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
246+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
247247
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
248248
defaults:
249249
run:
@@ -279,7 +279,7 @@ jobs:
279279
runs-on: ubuntu-latest
280280
if: github.ref != 'refs/heads/main'
281281
container:
282-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
282+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
283283
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
284284
defaults:
285285
run:

‎.github/workflows/checkcode.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
clang-tidy:
3030
runs-on: ubuntu-latest
3131
container:
32-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
32+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
3333
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
3434
defaults:
3535
run:
@@ -55,7 +55,7 @@ jobs:
5555
verify-headers:
5656
runs-on: ubuntu-latest
5757
container:
58-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
58+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
5959
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
6060
defaults:
6161
run:

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
clang18_coverage_build:
99
runs-on: ubuntu-latest
1010
container:
11-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
11+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
1212
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1313
defaults:
1414
run:
@@ -45,7 +45,7 @@ jobs:
4545
needs: clang18_coverage_build
4646
runs-on: ubuntu-latest
4747
container:
48-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
48+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
4949
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
5050
strategy:
5151
matrix:
@@ -111,7 +111,7 @@ jobs:
111111
needs: [clang18_coverage_test, clang18_coverage_build]
112112
runs-on: ubuntu-latest
113113
container:
114-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
114+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
115115
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
116116
steps:
117117
- uses: actions/checkout@v6

‎.github/workflows/documentation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
doxygen:
1919
runs-on: ubuntu-latest
2020
container:
21-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
21+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
2222
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
2323
defaults:
2424
run:
@@ -44,7 +44,7 @@ jobs:
4444
documentation:
4545
runs-on: ubuntu-latest
4646
container:
47-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
47+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
4848
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
4949
defaults:
5050
run:

‎.github/workflows/nightly_tests.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
gcc13_assertions_build:
99
runs-on: ubuntu-latest
1010
container:
11-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
11+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
1212
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1313
defaults:
1414
run:
@@ -43,7 +43,7 @@ jobs:
4343
needs: gcc13_assertions_build
4444
runs-on: ubuntu-latest
4545
container:
46-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
46+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
4747
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
4848
strategy:
4949
fail-fast: false
@@ -95,7 +95,7 @@ jobs:
9595
clang18_build:
9696
runs-on: ubuntu-latest
9797
container:
98-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
98+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
9999
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
100100
defaults:
101101
run:
@@ -193,7 +193,7 @@ jobs:
193193
needs: clang18_build
194194
runs-on: ubuntu-latest
195195
container:
196-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
196+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
197197
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
198198
strategy:
199199
fail-fast: false
@@ -245,7 +245,7 @@ jobs:
245245
clang18_build_oldest_supported_dependencies:
246246
runs-on: ubuntu-latest
247247
container:
248-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:24b228a5
248+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:35e0657d
249249
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
250250
defaults:
251251
run:
@@ -280,7 +280,7 @@ jobs:
280280
needs: clang18_build_oldest_supported_dependencies
281281
runs-on: ubuntu-latest
282282
container:
283-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:24b228a5
283+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:35e0657d
284284
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
285285
strategy:
286286
fail-fast: false
@@ -319,7 +319,7 @@ jobs:
319319
gcc13_no_optional_dependencies_build:
320320
runs-on: ubuntu-latest
321321
container:
322-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
322+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
323323
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
324324
defaults:
325325
run:
@@ -354,7 +354,7 @@ jobs:
354354
needs: gcc13_no_optional_dependencies_build
355355
runs-on: ubuntu-latest
356356
container:
357-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
357+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
358358
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
359359
strategy:
360360
fail-fast: false
@@ -406,7 +406,7 @@ jobs:
406406
gcc13_asan_build:
407407
runs-on: ubuntu-latest
408408
container:
409-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
409+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
410410
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
411411
defaults:
412412
run:
@@ -441,7 +441,7 @@ jobs:
441441
needs: gcc13_asan_build
442442
runs-on: ubuntu-latest
443443
container:
444-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:24b228a5
444+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:35e0657d
445445
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
446446
strategy:
447447
fail-fast: false

‎dependencies/current/qhull/install.sh‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎docker/dependencies/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ RUN apt-get update && apt-get install -y \
5858
libsuitesparse-dev \
5959
libmumps-dev \
6060
libscalapack-mpi-dev \
61+
libqhull-dev \
6162
mpi-default-dev \
6263
ninja-build \
6364
libyaml-dev \
@@ -81,9 +82,6 @@ RUN /dependencies/current/cmake/install.sh /usr/local
8182
# Install superLU_dist 7.2.0
8283
RUN /dependencies/current/superlu_dist/install.sh ${INSTALL_DIR}
8384

84-
# Install qhull 2012.1
85-
RUN /dependencies/current/qhull/install.sh ${INSTALL_DIR}
86-
8785
# Install Trilinos 2025.6
8886
RUN /dependencies/current/trilinos/install.sh ${INSTALL_DIR}
8987

‎docker/oldest_supported/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ RUN apt-get update && apt-get install -y \
5858
libsuitesparse-dev \
5959
libmumps-dev \
6060
libscalapack-mpi-dev \
61+
libqhull-dev \
6162
mpi-default-dev \
6263
ninja-build \
6364
libyaml-dev \
@@ -81,9 +82,6 @@ RUN /dependencies/current/cmake/install.sh /usr/local
8182
# Install superLU_dist 7.2.0
8283
RUN /dependencies/current/superlu_dist/install.sh ${INSTALL_DIR}
8384

84-
# Install qhull 2012.1
85-
RUN /dependencies/current/qhull/install.sh ${INSTALL_DIR}
86-
8785
# Install Trilinos 2025.6
8886
RUN /dependencies/oldest_supported/trilinos/install.sh ${INSTALL_DIR}
8987

‎docker/trilinos_develop/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ RUN apt-get update && apt-get install -y \
5555
libparmetis-dev \
5656
libmetis-dev \
5757
libsuitesparse-dev \
58+
libqhull-dev \
5859
ninja-build \
5960
libyaml-dev \
6061
clang \
@@ -79,9 +80,6 @@ RUN /dependencies/current/cmake/install.sh /usr/local
7980
# Install superLU_dist 7.2.0
8081
RUN /dependencies/current/superlu_dist/install.sh ${INSTALL_DIR}
8182

82-
# Install qhull 2012.1
83-
RUN /dependencies/current/qhull/install.sh ${INSTALL_DIR}
84-
8583
# Install Trilinos
8684
RUN /dependencies/trilinos_develop/trilinos/install.sh ${INSTALL_DIR} ${TRILINOS_VERSION}
8785

0 commit comments

Comments
 (0)