From dafd66c2f05f783b93aeb57ca7b64aab566e5eb3 Mon Sep 17 00:00:00 2001
From: Martin Genet <martin.genet@polytechnique.edu>
Date: Tue, 25 Jun 2019 16:44:50 +0200
Subject: [PATCH] 2017.2.0 only supports py2, 2019.1.0 only supports py3

---
 Docker/dolfin_dic-dev-2017.2.0/Dockerfile | 3 +--
 Docker/dolfin_dic-dev/Dockerfile          | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Docker/dolfin_dic-dev-2017.2.0/Dockerfile b/Docker/dolfin_dic-dev-2017.2.0/Dockerfile
index f68239e..85506fa 100644
--- a/Docker/dolfin_dic-dev-2017.2.0/Dockerfile
+++ b/Docker/dolfin_dic-dev-2017.2.0/Dockerfile
@@ -18,10 +18,9 @@ FROM quay.io/fenicsproject/stable: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 python-future python-numpy; 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/*
diff --git a/Docker/dolfin_dic-dev/Dockerfile b/Docker/dolfin_dic-dev/Dockerfile
index 06dbfdb..113590e 100644
--- a/Docker/dolfin_dic-dev/Dockerfile
+++ b/Docker/dolfin_dic-dev/Dockerfile
@@ -1,8 +1,8 @@
 FROM quay.io/fenicsproject/stable:2019.1.0.r3
 
-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 install python3-future python3-numpy; apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-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/*
+RUN apt-get update; apt-get -y install libvtk7-dev 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/*
-- 
GitLab