diff --git a/.gitignore b/.gitignore index 4554ccf6728b440fa6f258522eba887cf2a52002..f3533710ef7a0e1cbbcb5b7cb2cdafa7fa65182e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,9 @@ *.pytest_cache* # ignore Sphinx documentation output *docs/build +# Ignore coverage files +.coverage +htmlcov # Ignore pip folder *egg-info/* # Ignore venv files diff --git a/Dockerfile b/Dockerfile index b58959d88c95750889acca007f2446357127d52b..dd58c7c636ccec4515d1354e864b39a53d61b215 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Start with a base image that includes conda -FROM continuumio/miniconda3 +FROM continuumio/miniconda3:latest # Set environment variables ENV CONDA_DEFAULT_ENV=base @@ -7,15 +7,14 @@ ENV PATH /opt/conda/envs/${CONDA_DEFAULT_ENV}/bin:$PATH ENV HOME /root # Create the environment and install packages +# RUN conda install -n ${CONDA_DEFAULT_ENV} python=3.11.8 -y # FEniCSx backend + documentation and testing dependencies -RUN conda install -n ${CONDA_DEFAULT_ENV} -c conda-forge fenics-dolfinx=0.8.0 mpich=4.2.1 pyvista=0.43.10 gcc=12.4.0 sphinx=7.3.7 myst-parser=4.0.0 sphinx-copybutton=0.5.2 sphinx-rtd-theme=3.0.1 pytest==8.3.3 pytest-cov==6.0.0 -y -# fxdgm package from git +RUN conda install -n ${CONDA_DEFAULT_ENV} -c conda-forge fenics-dolfinx=0.8.0 mpich=4.2.1 pyvista=0.43.10 gcc=12.4.0 sphinx=7.3.7 myst-parser=4.0.0 sphinx-copybutton=0.5.2 sphinx-rtd-theme=3.0.1 pytest=8.3.3 pytest-cov=6.0.0 sqlite=3.41.2 -y # Activate environment # SHELL ["conda", "run", "-n", "fenicsx-env", "/bin/bash", "-c"] WORKDIR /root -# WORKDIR /solver ADD . /fxdgm RUN pip install --editable /fxdgm/.