neurodebian configuration changes

Dockerfile

@@ -2,21 +2,48 @@
 
 # Start with the Matlab r2013b runtime container
 FROM flywheel/matlab-mcr:v82
-
 MAINTAINER Michael Perry <[email protected]>
 
 ENV FLYWHEEL /flywheel/v0
 WORKDIR ${FLYWHEEL}
 COPY run ${FLYWHEEL}/run
 
-############################
+###########################
 # Install dependencies
 
-# Configure neurodebian repo
-RUN wget -O- http://neuro.debian.net/lists/trusty.us-nh.full | tee /etc/apt/sources.list.d/neurodebian.sources.list
-RUN apt-key adv --recv-keys --keyserver hkp://pgp.mit.edu:80 0xA5D32F012649A5A9
-
-RUN apt-get update && apt-get install -y xvfb \
+# Configure neurodebian
+# (https://github.com/neurodebian/dockerfiles/blob/master/dockerfiles/trusty-non-free/Dockerfile)
+RUN set -x \
+    && apt-get update \
+    && { \
+      which gpg \
+       || apt-get install -y --no-install-recommends gnupg \
+      ; } \
+# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
+# so, if we're not running gnupg 1.x, explicitly install dirmngr too
+    && { \
+        gpg --version | grep -q '^gpg (GnuPG) 1\.' \
+        || apt-get install -y --no-install-recommends dirmngr \
+        ; } \
+        && rm -rf /var/lib/apt/lists/*
+
+RUN set -x \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys DD95CC430502E37EF840ACEEA5D32F012649A5A9 \
+    && gpg --export DD95CC430502E37EF840ACEEA5D32F012649A5A9 > /etc/apt/trusted.gpg.d/neurodebian.gpg \
+    && rm -rf "$GNUPGHOME" \
+    && apt-key list | grep neurodebian
+
+RUN { \
+    echo 'deb http://neuro.debian.net/debian trusty main'; \
+    echo 'deb http://neuro.debian.net/debian data main'; \
+} > /etc/apt/sources.list.d/neurodebian.sources.list
+
+RUN sed -i -e 's,main *$,main contrib non-free,g' /etc/apt/sources.list.d/neurodebian.sources.list; grep -q 'deb .* multiverse$' /etc/apt/sources.list || sed -i -e 's,universe *$,universe multiverse,g' /etc/apt/sources.list
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --force-yes \
+    xvfb \
     xfonts-100dpi \
     xfonts-75dpi \
     xfonts-cyrillic \