From a2952284e50584c7be715df6b95e06b6ed4c4a8a Mon Sep 17 00:00:00 2001
From: Martin Genet <martin.genet@polytechnique.edu>
Date: Fri, 21 Jun 2019 12:13:18 +0200
Subject: [PATCH] dockerfiles for 2017.2.0 & 2019.1.0

---
 Docker/dolfin_dic-dev-2017.2.0/Dockerfile | 37 +++++++++++++++++++++++
 Docker/dolfin_dic-dev/Dockerfile          | 28 +++--------------
 Docker/dolfin_dic/Dockerfile              |  1 +
 3 files changed, 42 insertions(+), 24 deletions(-)
 create mode 100644 Docker/dolfin_dic-dev-2017.2.0/Dockerfile

diff --git a/Docker/dolfin_dic-dev-2017.2.0/Dockerfile b/Docker/dolfin_dic-dev-2017.2.0/Dockerfile
new file mode 100644
index 0000000..f68239e
--- /dev/null
+++ b/Docker/dolfin_dic-dev-2017.2.0/Dockerfile
@@ -0,0 +1,37 @@
+#FROM ubuntu:latest
+#FROM quay.io/fenicsproject/stable:2016.1.0
+#FROM quay.io/fenicsproject/stable:2016.2.0
+#FROM quay.io/fenicsproject/stable:2017.1.0
+FROM quay.io/fenicsproject/stable:2017.2.0
+#FROM quay.io/fenicsproject/stable:current
+#FROM quay.io/fenicsproject/stable:latest
+
+#USER root
+
+#RUN apt-get update; apt-get -y upgrade; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+#RUN apt-get update; apt-get install -y software-properties-common
+#RUN add-apt-repository -y ppa:fenics-packages/fenics-2016.1.0
+#RUN add-apt-repository -y ppa:fenics-packages/fenics-2016.2.0
+#RUN add-apt-repository -y ppa:fenics-packages/fenics-2017.1.0
+#RUN add-apt-repository -y ppa:fenics-packages/fenics-2017.2.0
+#RUN add-apt-repository -y ppa:fenics-packages/fenics
+#RUN apt-get update; apt-get install -y fenics; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN apt-get update; apt-get -y install python-future; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN apt-get update; apt-get -y install libvtk6-dev python-vtk6; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN pip3 install vtk; rm -rf ~/.cache/pip
+ENV CPATH="/usr/include/vtk-6.2":$CPATH
+
+RUN apt-get update; apt-get -y install gnuplot git; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+WORKDIR /home/fenics
+RUN git clone https://github.com/aschn/gnuplot-colorbrewer.git
+RUN echo "set loadpath \"/home/fenics/gnuplot-colorbrewer/diverging:/home/fenics/gnuplot-colorbrewer/qualitative:/home/fenics/gnuplot-colorbrewer/sequential\"" > .gnuplot
+
+WORKDIR /home/fenics
+RUN mkdir code
+ENV PYTHONPATH=/home/fenics/code:$PYTHONPATH
+ENV PATH=/home/fenics/code/myPythonLibrary:/home/fenics/code/myVTKPythonLibrary:/home/fenics/code/vtkpython_cbl:$PATH
+
+#USER root
diff --git a/Docker/dolfin_dic-dev/Dockerfile b/Docker/dolfin_dic-dev/Dockerfile
index edc3fa3..06dbfdb 100644
--- a/Docker/dolfin_dic-dev/Dockerfile
+++ b/Docker/dolfin_dic-dev/Dockerfile
@@ -1,27 +1,9 @@
-#FROM ubuntu:latest
-#FROM quay.io/fenicsproject/stable:2016.1.0
-#FROM quay.io/fenicsproject/stable:2016.2.0
-#FROM quay.io/fenicsproject/stable:2017.1.0
-FROM quay.io/fenicsproject/stable:2017.2.0
-#FROM quay.io/fenicsproject/stable:current
-#FROM quay.io/fenicsproject/stable:latest
+FROM quay.io/fenicsproject/stable:2019.1.0.r3
 
-#USER root
+RUN apt-get update; apt-get -y install python-future python-numpy; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-#RUN apt-get update; apt-get -y upgrade; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-#RUN apt-get update; apt-get install -y software-properties-common
-#RUN add-apt-repository -y ppa:fenics-packages/fenics-2016.1.0
-#RUN add-apt-repository -y ppa:fenics-packages/fenics-2016.2.0
-#RUN add-apt-repository -y ppa:fenics-packages/fenics-2017.1.0
-#RUN add-apt-repository -y ppa:fenics-packages/fenics-2017.2.0
-#RUN add-apt-repository -y ppa:fenics-packages/fenics
-#RUN apt-get update; apt-get install -y fenics; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN apt-get update; apt-get -y install libvtk6-dev; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-ENV CPATH="/usr/include/vtk-6.2":$CPATH
-
-RUN pip install future vtk; pip3 install vtk
+RUN apt-get update; apt-get -y install libvtk7-dev python-vtk6 python3-vtk7; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+ENV CPATH="/usr/include/vtk-7.1":$CPATH
 
 RUN apt-get update; apt-get -y install gnuplot git; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 WORKDIR /home/fenics
@@ -32,5 +14,3 @@ WORKDIR /home/fenics
 RUN mkdir code
 ENV PYTHONPATH=/home/fenics/code:$PYTHONPATH
 ENV PATH=/home/fenics/code/myPythonLibrary:/home/fenics/code/myVTKPythonLibrary:/home/fenics/code/vtkpython_cbl:$PATH
-
-#USER root
diff --git a/Docker/dolfin_dic/Dockerfile b/Docker/dolfin_dic/Dockerfile
index 0e29492..4f1f299 100644
--- a/Docker/dolfin_dic/Dockerfile
+++ b/Docker/dolfin_dic/Dockerfile
@@ -1,5 +1,6 @@
 FROM dolfin_dic-dev
 
+RUN apt-get update; apt-get -y install git; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 WORKDIR /home/fenics/code
 RUN git clone https://gitlab.inria.fr/mgenet/myPythonLibrary.git
 RUN git clone https://gitlab.inria.fr/mgenet/myVTKPythonLibrary.git
-- 
GitLab