[ARVADOS] updated: 35a8772d184672fd481c87f577e5dde04f08dac0

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

       via  35a8772d184672fd481c87f577e5dde04f08dac0 (commit)
      from  272eef11358d08c026ae68df71d0ff04e5faf990 (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 35a8772d184672fd481c87f577e5dde04f08dac0
Author: Brett Smith <brett at curoverse.com>
Date:   Tue May 6 10:25:43 2014 -0400

    crunch-job: Ignore empty docker_image constraint.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 681349b..0a06686 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -500,8 +500,8 @@ if (!$have_slurm)
 
 # If this job requires a Docker image, install that.
 my $docker_bin = "/usr/bin/docker.io";
-my $docker_image = $Job->{runtime_constraints}->{docker_image};
-if (defined($docker_image)) {
+my $docker_image = $Job->{runtime_constraints}->{docker_image} || "";
+if ($docker_image) {
   my $docker_pid = fork();
   if ($docker_pid == 0)
   {
@@ -636,7 +636,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
 	  "&& perl -";
     }
     $command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
-    if (defined($docker_image))
+    if ($docker_image)
     {
       $command .= "$docker_bin run -i -a stdin -a stdout -a stderr ";
       # Dynamically configure the container to use the host system as its

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


hooks/post-receive
--