Merge remote-tracking branch 'gitlab-ci/master'

Makefile

@@ -4,11 +4,11 @@ clean:
 	rm -f -- ./*-stamp
 
 base-8-stamp: base-8/Dockerfile
-	docker build -t duneci/base:8 base-8
+	docker build --no-cache -t duneci/base:8 base-8
 	touch $@
 
 base-9-stamp: base-9/Dockerfile
-	docker build -t duneci/base:9 base-9
+	docker build --no-cache -t duneci/base:9 base-9
 	touch $@
 
 dune-2.3-stamp: base-8-stamp dune-2.3/Dockerfile
@@ -24,8 +24,8 @@ dune-fufem-stamp: dune-fufem/Dockerfile dune-2.4-stamp
 	touch $@
 
 dune-git-stamp: base-9-stamp dune-git/Dockerfile
-	docker build -t duneci/dune:git-staging dune-git
-	docker run -i duneci/dune:git-staging sh -c "dunecontrol make build_tests && dunecontrol make test"
+	docker build --no-cache -t duneci/dune:git-staging dune-git
+	#docker run -i duneci/dune:git-staging sh -c "dunecontrol make build_tests && dunecontrol make test"
 	docker tag -f duneci/dune:git-staging duneci/dune:git
 	touch $@
 

dune-git/Dockerfile

@@ -2,7 +2,13 @@ FROM duneci/base:9
 
 USER root
 WORKDIR /
-RUN apt-get install --no-install-recommends --yes libug-dev
+RUN apt-get install --no-install-recommends --yes \
+  gnuplot-nox \
+  libscotchmetis-dev \
+  libug-dev \
+  locales-all \
+  python-vtk6 \
+  && apt-get clean
 
 USER duneci
 WORKDIR /duneci