Skip to content

Commit 86677c0

Browse files
authored
Update docker image with build isolation (#115)
* Update docker image with build isolation * Revert version bound * Pin sonarcloud versions
1 parent de949a2 commit 86677c0

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/sonarcloud.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,11 @@ jobs:
6767
uses: jorgensd/actions/[email protected]
6868
with:
6969
petsc_arch: ${PETSC_ARCH}
70-
dolfinx: main
71-
70+
dolfinx: v0.8.0
71+
basix: v0.8.0
72+
ufl: 2024.1.0.post0
73+
ffcx: v0.8.0
74+
7275
- name: Run build-wrapper
7376
run: |
7477
cmake -S ./cpp -B build-mpc

docker/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ARG PYTHON_VERSION=3.10
99
ENV HDF5_MPI="ON" \
1010
HDF5_DIR="/usr/local"
1111

12+
RUN python3 -m pip install -U pip setuptools
13+
1214
# Install h5py https://github.com/h5py/h5py/issues/2222
1315
RUN python3 -m pip install --no-cache-dir --no-binary=h5py git+https://github.com/h5py/h5py.git
1416
RUN python3 -m pip install meshio
@@ -21,7 +23,7 @@ RUN . /usr/local/bin/dolfinx-real-mode && \
2123
. /usr/local/dolfinx-real/lib/dolfinx/dolfinx.conf && \
2224
cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr/local/dolfinx-real -DCMAKE_BUILD_TYPE=Developer -B build-dir-real dolfinx_mpc/cpp/ && \
2325
ninja install -j4 -C build-dir-real && \
24-
python3 -m pip install -v --target /usr/local/dolfinx-real/lib/python${PYTHON_VERSION}/dist-packages --no-dependencies --no-cache-dir dolfinx_mpc/python
26+
python3 -m pip install -v --no-build-isolation --check-build-dependencies --no-dependencies --target /usr/local/dolfinx-real/lib/python${PYTHON_VERSION}/dist-packages --config-settings=cmake.build-type=Developer -e dolfinx_mpc/python/[test]
2527

2628
# Clean repo to remove build dir from pip
2729
RUN rm -rf dolfinx_mpc/python/build
@@ -31,6 +33,6 @@ RUN . /usr/local/bin/dolfinx-complex-mode && \
3133
. /usr/local/dolfinx-complex/lib/dolfinx/dolfinx.conf && \
3234
cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr/local/dolfinx-complex -DCMAKE_BUILD_TYPE=Developer -B build-dir-complex dolfinx_mpc/cpp/ && \
3335
ninja install -j4 -C build-dir-complex && \
34-
python3 -m pip install -v --target /usr/local/dolfinx-complex/lib/python${PYTHON_VERSION}/dist-packages --no-dependencies --no-cache-dir dolfinx_mpc/python
36+
python3 -m pip install -v --no-build-isolation --check-build-dependencies --no-dependencies --target /usr/local/dolfinx-complex/lib/python${PYTHON_VERSION}/dist-packages --config-settings=cmake.build-type=Developer -e dolfinx_mpc/python/[test]
3537

3638
WORKDIR /root

0 commit comments

Comments
 (0)