Merge branch 'master' into 8654-arv-jobs-cwl-runner

Conflicts:
	docker/jobs/Dockerfile

diff --combined docker/jobs/Dockerfile
index bbe7844b7dd8f5accd7745c331bf802271a2682a,30c2416e99511b2f1919591671296d7d13a659a3..d80c3a882defe43676476df144401eee64d97728
--- 1/docker/jobs/Dockerfile
--- 2/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@@ -1,18 -1,19 +1,19 @@@
 -# Based on Debian Wheezy
 -FROM arvados/debian:wheezy
 +# Based on Debian Jessie
 +FROM debian:jessie
  MAINTAINER Ward Vandewege <ward@curoverse.com>
  
  ENV DEBIAN_FRONTEND noninteractive
  
  ADD apt.arvados.org.list /etc/apt/sources.list.d/
  RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
+ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3
  
- RUN apt-get update -q && apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev nodejs python-arvados-cwl-runner
+ ARG COMMIT=latest
+ RUN echo $COMMIT && apt-get update -q
  
- RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3
 -RUN apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev
++RUN apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev nodejs python-arvados-cwl-runner
  
  # Install dependencies and set up system.
- # The FUSE packages help ensure that we can install the Python SDK (arv-mount).
  RUN /usr/sbin/adduser --disabled-password \
        --gecos 'Crunch execution user' crunch && \
      /usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job