[ARVADOS] updated: 046dc0138871802abece31cd3a3563ea4dcd74e2

[git at public.curoverse.com]

Summary of changes:
 docker/jobs/Dockerfile                 | 3 ++-
 sdk/cli/bin/crunch-job                 | 4 ++--
 services/api/script/crunch-dispatch.rb | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

       via  046dc0138871802abece31cd3a3563ea4dcd74e2 (commit)
       via  d313215eeb0c8be6ddcec8c2e6f04efab76f3d02 (commit)
      from  188a9dd98e23d62e0126fcbf60619d1cd7e4537c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 046dc0138871802abece31cd3a3563ea4dcd74e2
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Dec 8 18:15:39 2014 -0500

    4027: arvados/jobs includes virtualenv.
    
    This lets you use the arvados/jobs image with the arvados_sdk_version
    feature of Crunch.

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index e140f27..313dd36 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -3,7 +3,8 @@ MAINTAINER Brett Smith <brett at 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 \

commit d313215eeb0c8be6ddcec8c2e6f04efab76f3d02
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Dec 8 18:15:11 2014 -0500

    4027: Fixup Crunch yet more.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 3f8bc0e..cf63d25 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1870,8 +1870,8 @@ if (@ARGV) {
     @ARGV = ("/bin/sh", "-ec",
              ". \Q$venv_dir/bin/activate\E; exec $orig_argv");
   } elsif (-d $python_src) {
-    $Log->("Warning: can't run virtualenv inside Docker container - " +
-           "can't install Python SDK");
+    $Log->("Warning: virtualenv not found inside Docker container default " +
+           "\$PATH. Can't install Python SDK.");
   }
 
   while (my ($sdk_dir, $sdk_envkey) = each(%SDK_ENVVARS)) {
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 5935cf4..5f8f7bf 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -386,7 +386,7 @@ class Dispatcher
       end
       next unless ready
 
-      cmd_args += [@crunch_job_bin,
+      cmd_args += ['bundle', 'exec', @crunch_job_bin,
                    '--job-api-token', @authorizations[job.uuid].api_token,
                    '--job', job.uuid,
                    '--git-dir', @arvados_internal]

-----------------------------------------------------------------------


hooks/post-receive
--