From 3925260095775c6b227e30c7cffb2a2ffcd0054e Mon Sep 17 00:00:00 2001
From: August Johansson <august.johansson@sintef.no>
Date: Thu, 5 Mar 2020 15:40:52 +0100
Subject: [PATCH 1/2] Add dockerfile

---
 docker/Dockerfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docker/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..c248ae2
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/fenicsproject/stable
+USER root
+
+RUN pip3 install --no-cache-dir --trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org \
+simplejson \
+mpi4py \
+h5py \
+scikit-image \
+tabulate
+
+RUN git clone https://github.com/mikaem/fenicstools.git && \
+cd fenicstools && \
+python3 setup.py install && \
+cd ..
+

From d6aeb35c12429ec527a4e7406ea26d7587cd5256 Mon Sep 17 00:00:00 2001
From: August Johansson <august.johansson@sintef.no>
Date: Thu, 5 Mar 2020 17:05:23 +0100
Subject: [PATCH 2/2] Add missing meshpy dependency and upgrade scipy

---
 docker/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c248ae2..d279faa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,15 +1,16 @@
 FROM quay.io/fenicsproject/stable
 USER root
 
-RUN pip3 install --no-cache-dir --trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org \
+RUN pip3 install -U --no-cache-dir --trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org \
 simplejson \
 mpi4py \
 h5py \
 scikit-image \
-tabulate
+tabulate \
+meshpy \
+scipy
 
 RUN git clone https://github.com/mikaem/fenicstools.git && \
 cd fenicstools && \
 python3 setup.py install && \
 cd ..
-