updated Dockerfile

- moved to contrib/ as it is not strictly needed at top-level
- standardized Dockerfile to what Docker recommends as best practices: each RUN
  command creates a new AUFS layer so it is best to pool commands

Dockerfile

@@ -1,22 +0,0 @@
-FROM ubuntu:trusty
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -q
-RUN apt-get install -qy texlive-full 
-RUN apt-get install -qy python-pygments 
-RUN apt-get install -qy gnuplot
-
-RUN apt-get install wget
-
-RUN mkdir -p /usr/share/fonts/truetype/FiraSans
-RUN mkdir -p /usr/share/fonts/opentype/FiraSans
-RUN wget "dev.carrois.com/wordpress/wp-content/uploads/downloads/fira_3_1/FiraMono3106.zip"
-RUN wget "dev.carrois.com/wordpress/wp-content/uploads/downloads/fira_3_1/FiraSans3106.zip"
-RUN unzip FiraSans3106.zip
-RUN unzip FiraMono3106.zip
-RUN sudo cp /Fira*/WEB/*.ttf /usr/share/fonts/truetype/FiraSans/
-RUN sudo cp /Fira*/OTF/Fira* /usr/share/fonts/opentype/FiraSans/
-RUN sudo fc-cache -f -v
-
-WORKDIR /data
-VOLUME ["/data"]

contrib/Dockerfile

@@ -0,0 +1,28 @@
+
+## Contributed by Walter Schulze (@awalterschulze)
+## Simpliefied by Dirk Eddelbuettel (@eddelbuettel)
+
+FROM ubuntu:trusty
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update -q \
+	&& apt-get install -qy \
+                gnuplot \
+                python-pygments \
+        	texlive-full \
+                wget
+
+RUN cd /tmp \
+    	&& mkdir -p /usr/share/fonts/truetype/FiraSans \
+	&& mkdir -p /usr/share/fonts/opentype/FiraSans \
+        && wget "dev.carrois.com/wordpress/wp-content/uploads/downloads/fira_3_1/FiraMono3106.zip" \
+        && wget "dev.carrois.com/wordpress/wp-content/uploads/downloads/fira_3_1/FiraSans3106.zip" \
+        && unzip FiraSans3106.zip \
+        && unzip FiraMono3106.zip \
+        && cp Fira*/WEB/*.ttf /usr/share/fonts/truetype/FiraSans/ \
+        && cp Fira*/OTF/Fira* /usr/share/fonts/opentype/FiraSans/ \
+        && fc-cache -f -v \
+        && rm -rf Fira*
+
+WORKDIR /data
+VOLUME ["/data"]