From: Tom Clegg <tom@curoverse.com>
Date: Fri, 31 Jul 2015 16:02:34 +0000 (-0400)
Subject: 6838: If env var override is not set, let crunch-job use its default.
X-Git-Tag: 1.1.0~1442^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e8ba9a0432ab7a304bb4b41eb563443f34cf2d7d

6838: If env var override is not set, let crunch-job use its default.
---

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index d430d0bce1..faba54deb9 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'] || "docker.io")
+    @docker_bin = ENV['CRUNCH_JOB_DOCKER_BIN']
 
     @arvados_internal = Rails.configuration.git_internal_dir
     if not File.exists? @arvados_internal
@@ -421,8 +421,11 @@ class Dispatcher
       cmd_args += [@crunch_job_bin,
                    '--job-api-token', @authorizations[job.uuid].api_token,
                    '--job', job.uuid,
-                   '--git-dir', @arvados_internal,
-                   '--docker-bin', @docker_bin]
+                   '--git-dir', @arvados_internal]
+
+      if @docker_bin
+        cmd_args += ['--docker-bin', @docker_bin]
+      end
 
       if @todo_job_retries.include?(job.uuid)
         cmd_args << "--force-unlock"