4670: Node Manager handles more libcloud exceptions.

[arvados.git] / docker / jobs / Dockerfile

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 1b493e3a30a88c68395dee7f52413be3f9f7b6db..313dd3662a2e80192db76e69e3243f9d56a2b90f 100644 (file)
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -3,7 +3,8 @@ MAINTAINER Brett Smith <brett@curoverse.com>
 
 # Install dependencies and set up system.
 # The FUSE packages help ensure that we can install the Python SDK (arv-mount).
-RUN /usr/bin/apt-get install -q -y python-dev python-llfuse python-pip \
+RUN /usr/bin/apt-get install -q -y \
+      python-dev python-llfuse python-pip python-virtualenv \
       libio-socket-ssl-perl libjson-perl liburi-perl libwww-perl dtrx \
       fuse libattr1-dev libfuse-dev && \
     /usr/sbin/adduser --disabled-password \
@@ -14,9 +15,6 @@ RUN /usr/bin/apt-get install -q -y python-dev python-llfuse python-pip \
 # Install Arvados packages.
 RUN (find /usr/src/arvados/sdk -name '*.gem' -print0 | \
       xargs -0rn 1 /usr/local/rvm/bin/rvm-exec default gem install) && \
-    cd /usr/src/arvados/services/fuse && \
-    python setup.py install && \
-    cd /usr/src/arvados/sdk/python && \
-    python setup.py install
+     apt-get -qqy install python-arvados-fuse
 
 USER crunch