6838: Document CRUNCH_JOB_DOCKER_BIN in example run script. Sync up with new default...

diff --git a/doc/install/install-crunch-dispatch.html.textile.liquid b/doc/install/install-crunch-dispatch.html.textile.liquid
index 300f55ae17f954419b1d3bc74a4ef1f965b8ad55..46ce04289e240af60f0c4417f0275f20015ab791 100644 (file)
--- 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 be84b54e18b37222763ffd980d3c1c9966c9606f..d430d0bce1e46a93af7dab17c088e7d226d8facb 100755 (executable)
--- 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