[ARVADOS] updated: 3e428f95590534844db8e67be1c204df5ebf274d

[git at public.curoverse.com]

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

       via  3e428f95590534844db8e67be1c204df5ebf274d (commit)
       via  e8ba9a0432ab7a304bb4b41eb563443f34cf2d7d (commit)
      from  d2cbbe5a55cec8e6a874ea65acec7bf36c8c0a83 (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 3e428f95590534844db8e67be1c204df5ebf274d
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 31 12:03:27 2015 -0400

    6838: Change default docker executable from docker.io to docker.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 13001e7..589a6ed 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -126,7 +126,7 @@ my $jobspec;
 my $job_api_token;
 my $no_clear_tmp;
 my $resume_stash;
-my $docker_bin = "docker.io";
+my $docker_bin = "docker";
 GetOptions('force-unlock' => \$force_unlock,
            'git-dir=s' => \$git_dir,
            'job=s' => \$jobspec,

commit e8ba9a0432ab7a304bb4b41eb563443f34cf2d7d
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 31 12:02:34 2015 -0400

    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 d430d0b..faba54d 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"

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


hooks/post-receive
--