Skip to content

Commit 1d0d0fe

Browse files
sebproellsebproell
committed
Docker: don't use a separate image for deal.II
1 parent aafd8be commit 1d0d0fe

File tree

10 files changed

+27
-120
lines changed

10 files changed

+27
-120
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:9d85686c
19+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
2020
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
2121
defaults:
2222
run:
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151
if: github.ref != 'refs/heads/main'
5252
container:
53-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
53+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
5454
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
5555
strategy:
5656
fail-fast: false
@@ -102,7 +102,7 @@ jobs:
102102
clang18_build:
103103
runs-on: ubuntu-latest
104104
container:
105-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
105+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
106106
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
107107
defaults:
108108
run:
@@ -146,7 +146,7 @@ jobs:
146146
needs: clang18_build
147147
runs-on: ubuntu-latest
148148
container:
149-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
149+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
150150
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
151151
defaults:
152152
run:
@@ -172,7 +172,7 @@ jobs:
172172
needs: clang18_build
173173
runs-on: ubuntu-latest
174174
container:
175-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
175+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
176176
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
177177
defaults:
178178
run:
@@ -224,7 +224,7 @@ jobs:
224224
gcc13_no_optional_dependencies_build:
225225
runs-on: ubuntu-latest
226226
container:
227-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
227+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
228228
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
229229
defaults:
230230
run:
@@ -248,7 +248,7 @@ jobs:
248248
needs: gcc13_no_optional_dependencies_build
249249
runs-on: ubuntu-latest
250250
container:
251-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
251+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
252252
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
253253
defaults:
254254
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:9d85686c
32+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
3333
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
3434
defaults:
3535
run:
@@ -53,7 +53,7 @@ jobs:
5353
verify-headers:
5454
runs-on: ubuntu-latest
5555
container:
56-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
56+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
5757
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
5858
defaults:
5959
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
gcc13_coverage_build:
99
runs-on: ubuntu-latest
1010
container:
11-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
11+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
1212
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1313
defaults:
1414
run:
@@ -41,7 +41,7 @@ jobs:
4141
needs: gcc13_coverage_build
4242
runs-on: ubuntu-latest
4343
container:
44-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
44+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
4545
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
4646
strategy:
4747
matrix:
@@ -107,7 +107,7 @@ jobs:
107107
needs: [gcc13_coverage_test, gcc13_coverage_build]
108108
runs-on: ubuntu-latest
109109
container:
110-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
110+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
111111
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
112112
steps:
113113
- uses: actions/checkout@v4

‎.github/workflows/docker.yml‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -63,58 +63,6 @@ jobs:
6363
}}
6464
base-image: "ubuntu:24.04"
6565

66-
check-if-build-dependencies-dealii-is-required:
67-
runs-on: ubuntu-latest
68-
if: github.event_name == 'workflow_dispatch'
69-
outputs:
70-
dependencies_hash: ${{ steps.check-docker-build-required.outputs.dependencies_hash }}
71-
build_docker_image: ${{ steps.check-docker-build-required.outputs.build_docker_image }}
72-
steps:
73-
- uses: actions/checkout@v4
74-
- id: check-docker-build-required
75-
uses: ./.github/actions/check_docker_build_required
76-
with:
77-
registry: ${{ env.REGISTRY }}
78-
username: ${{ github.actor }}
79-
password: ${{ secrets.GITHUB_TOKEN }}
80-
image-name: ${{ env.REGISTRY }}/${{ env.PROJECT_NAMESPACE }}/4c-dependencies-dealii-ubuntu24.04
81-
compute-dependencies-hash-script: './docker/dependencies_dealii/compute_dependencies_hash.sh'
82-
83-
build-dependencies-dealii:
84-
runs-on: ubuntu-latest
85-
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
86-
permissions:
87-
contents: read
88-
packages: write
89-
id-token: write
90-
needs:
91-
- check-if-build-dependencies-dealii-is-required
92-
- build-dependencies
93-
if: ${{ github.event_name == 'workflow_dispatch' && needs.check-if-build-dependencies-dealii-is-required.outputs.build_docker_image
94-
== 'true' }}
95-
steps:
96-
- name: Checkout repository
97-
uses: actions/checkout@v4
98-
# We need to compute the dependencies hash for the base image (which must have been built before)
99-
- name: Compute dependencies hash base dependencies
100-
id: compute-dependencies-hash-base
101-
uses: ./.github/actions/compute-and-check-dependencies-hash
102-
with:
103-
compute-dependencies-hash-script: './docker/dependencies/compute_dependencies_hash.sh'
104-
skip-check: 'true'
105-
- name: Build and push image
106-
uses: ./.github/actions/build_dependencies
107-
with:
108-
docker-file: docker/dependencies_dealii/Dockerfile
109-
registry: ${{ env.REGISTRY }}
110-
username: ${{ github.actor }}
111-
password: ${{ secrets.GITHUB_TOKEN }}
112-
image-name: ${{ env.REGISTRY }}/${{ env.PROJECT_NAMESPACE }}/4c-dependencies-dealii-ubuntu24.04
113-
dependencies-hash: ${{ needs.check-if-build-dependencies-dealii-is-required.outputs.dependencies_hash
114-
}}
115-
base-image: "ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:${{ steps.check-if-build-dependencies-required.outputs.dependencies_hash
116-
}}"
117-
11866
tag-images-as-main:
11967
runs-on: ubuntu-latest
12068
if: ${{ github.ref == 'refs/heads/main' && github.repository == '4C-multiphysics/4C' }}

‎.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:9d85686c
21+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
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:9d85686c
47+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
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: 8 additions & 8 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:9d85686c
11+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
1212
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1313
defaults:
1414
run:
@@ -41,7 +41,7 @@ jobs:
4141
needs: gcc13_assertions_build
4242
runs-on: ubuntu-latest
4343
container:
44-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
44+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
4545
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
4646
strategy:
4747
fail-fast: false
@@ -93,7 +93,7 @@ jobs:
9393
clang18_build:
9494
runs-on: ubuntu-latest
9595
container:
96-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
96+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
9797
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
9898
defaults:
9999
run:
@@ -177,7 +177,7 @@ jobs:
177177
needs: clang18_build
178178
runs-on: ubuntu-latest
179179
container:
180-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
180+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
181181
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
182182
strategy:
183183
fail-fast: false
@@ -229,7 +229,7 @@ jobs:
229229
gcc13_no_optional_dependencies_build:
230230
runs-on: ubuntu-latest
231231
container:
232-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
232+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
233233
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
234234
defaults:
235235
run:
@@ -262,7 +262,7 @@ jobs:
262262
needs: gcc13_no_optional_dependencies_build
263263
runs-on: ubuntu-latest
264264
container:
265-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
265+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
266266
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
267267
strategy:
268268
fail-fast: false
@@ -314,7 +314,7 @@ jobs:
314314
gcc13_asan_build:
315315
runs-on: ubuntu-latest
316316
container:
317-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
317+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
318318
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
319319
defaults:
320320
run:
@@ -347,7 +347,7 @@ jobs:
347347
needs: gcc13_asan_build
348348
runs-on: ubuntu-latest
349349
container:
350-
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:9d85686c
350+
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:3e3acd82
351351
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
352352
strategy:
353353
fail-fast: false

dependencies/dealii/install.sh renamed to dependencies/current/dealii/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ $CMAKE_COMMAND \
5353
-D P4EST_DIR=$INSTALL_DIR/FAST \
5454
..
5555

56-
make -j${NPROCS} install
56+
# Use a limited number of processes to avoid overloading the system for expensive files
57+
make -j2 install
5758
cd ../..
5859
rm -rf dealii

‎docker/dependencies/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ RUN /dependencies/current/qhull/install.sh ${INSTALL_DIR}
8686
# Install Trilinos 2022_Q1
8787
RUN /dependencies/current/trilinos/install.sh ${INSTALL_DIR}
8888

89+
# Install deal.II (needs to happen after Trilinos)
90+
RUN /dependencies/current/dealii/install.sh ${INSTALL_DIR}
91+
8992
# Install (optional) backtrace library
9093
RUN /dependencies/current/backtrace/install.sh ${INSTALL_DIR}
9194

‎docker/dependencies_dealii/Dockerfile‎

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

‎docker/dependencies_dealii/compute_dependencies_hash.sh‎

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

0 commit comments

Comments
 (0)