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

[arvados.git] / docker / jobs / Dockerfile

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 0d7295873f723e637cf76413e01c16c6a2be5d95..bbe7844b7dd8f5accd7745c331bf802271a2682a 100644 (file)
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -1,14 +1,13 @@
-# 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 apt-get update -q
 
-RUN apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev
+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
 
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3