From: Peter Amstutz Date: Mon, 28 Mar 2016 13:37:37 +0000 (-0400) Subject: Merge branch 'master' into 8654-arv-jobs-cwl-runner X-Git-Tag: 1.1.0~1022^2~13 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5c1410e60eb06769207dbafd77501bf2fa45a29b Merge branch 'master' into 8654-arv-jobs-cwl-runner Conflicts: docker/jobs/Dockerfile --- 5c1410e60eb06769207dbafd77501bf2fa45a29b diff --cc docker/jobs/Dockerfile index bbe7844b7d,30c2416e99..d80c3a882d --- a/docker/jobs/Dockerfile +++ b/docker/jobs/Dockerfile @@@ -6,13 -6,14 +6,14 @@@ ENV DEBIAN_FRONTEND noninteractiv 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