[ARVADOS] created: d2cbbe5a55cec8e6a874ea65acec7bf36c8c0a83

[git at public.curoverse.com]

        at  d2cbbe5a55cec8e6a874ea65acec7bf36c8c0a83 (commit)


commit d2cbbe5a55cec8e6a874ea65acec7bf36c8c0a83
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 31 00:32:45 2015 -0400

    6838: Document CRUNCH_JOB_DOCKER_BIN in example run script. Sync up with new default in sdk/bin/crunch-job.

diff --git a/doc/install/install-crunch-dispatch.html.textile.liquid b/doc/install/install-crunch-dispatch.html.textile.liquid
index 300f55a..46ce042 100644
--- a/doc/install/install-crunch-dispatch.html.textile.liquid
+++ b/doc/install/install-crunch-dispatch.html.textile.liquid
@@ -139,6 +139,10 @@ export PATH="$PATH":/path/to/arvados/services/crunch
 export ARVADOS_API_HOST={{ site.arvados_api_host }}
 export CRUNCH_DISPATCH_LOCKFILE=/var/lock/crunch-dispatch
 
+# This is the path to docker on your compute nodes. You might need to
+# change it to "docker", "/opt/bin/docker", etc.
+export CRUNCH_JOB_DOCKER_BIN=docker.io
+
 fuser -TERM -k $CRUNCH_DISPATCH_LOCKFILE || true
 
 ## Only if your SSL cert is unverifiable:
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index be84b54..d430d0b 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -63,7 +63,7 @@ class Dispatcher
       raise "No CRUNCH_JOB_BIN env var, and crunch-job not in path."
     end
 
-    @docker_bin = (ENV['CRUNCH_JOB_DOCKER_BIN'] || "/usr/bin/docker.io")
+    @docker_bin = (ENV['CRUNCH_JOB_DOCKER_BIN'] || "docker.io")
 
     @arvados_internal = Rails.configuration.git_internal_dir
     if not File.exists? @arvados_internal

commit 8d2aebfd3a0e4814b292659710386f949cafe092
Merge: 70ce2cc 60f3ef7
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 31 00:25:23 2015 -0400

    Merge branch 'crunch-dispatch-docker-bin-env' of https://github.com/wtsi-hgi/arvados into 6838-docker-path


commit 60f3ef78fe5dc269b2c06d980cc95cbc4f8fdd84
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date:   Fri Jul 31 02:21:54 2015 +0100

    Makes it possible to set docker_bin in crunch-job
    
    Adds a new environment variable (CRUNCH_JOB_DOCKER_BIN) that
    crunch-dispatch.rb passes along to crunch-job (or if unset, it
    defaults to "/usr/bin/docker.io" which is already the default for
    crunch-job).

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 515bfaa..be84b54 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -63,6 +63,8 @@ class Dispatcher
       raise "No CRUNCH_JOB_BIN env var, and crunch-job not in path."
     end
 
+    @docker_bin = (ENV['CRUNCH_JOB_DOCKER_BIN'] || "/usr/bin/docker.io")
+
     @arvados_internal = Rails.configuration.git_internal_dir
     if not File.exists? @arvados_internal
       $stderr.puts `mkdir -p #{@arvados_internal.shellescape} && git init --bare #{@arvados_internal.shellescape}`
@@ -419,7 +421,8 @@ class Dispatcher
       cmd_args += [@crunch_job_bin,
                    '--job-api-token', @authorizations[job.uuid].api_token,
                    '--job', job.uuid,
-                   '--git-dir', @arvados_internal]
+                   '--git-dir', @arvados_internal,
+                   '--docker-bin', @docker_bin]
 
       if @todo_job_retries.include?(job.uuid)
         cmd_args << "--force-unlock"

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


hooks/post-receive
--