[ARVADOS] updated: 2e314245ce71048664ccbc149c9b065ee2920ae1

[git at public.curoverse.com]

Summary of changes:
 doc/api/schema/Job.html.textile.liquid |    2 +-
 sdk/cli/bin/crunch-job                 |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

       via  2e314245ce71048664ccbc149c9b065ee2920ae1 (commit)
      from  35a8772d184672fd481c87f577e5dde04f08dac0 (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 2e314245ce71048664ccbc149c9b065ee2920ae1
Author: Brett Smith <brett at curoverse.com>
Date:   Wed May 7 08:18:25 2014 -0400

    crunch: `docker.io pull` can't take a hash.
    
    Refs #2942.  Like I said in my recent comments there, this pull
    functionality is a bit of a stopgap.  I could make this more robust
    by, e.g., checking ahead of time that the hash image is already
    installed on all nodes, but I expect that work will be completely
    replaced when we integrate Docker and Keep.

diff --git a/doc/api/schema/Job.html.textile.liquid b/doc/api/schema/Job.html.textile.liquid
index cbbec4e..097d0df 100644
--- a/doc/api/schema/Job.html.textile.liquid
+++ b/doc/api/schema/Job.html.textile.liquid
@@ -50,7 +50,7 @@ h3. Runtime constraints
 
 table(table table-bordered table-condensed).
 |_. Key|_. Type|_. Description|_. Implemented|
-|docker_image|string|The name of a Docker image that this Job needs to run.  If specified, Crunch will create a Docker container from this image, and run the Job's script inside that.  The Keep mount and work directories will be available as volumes inside this container.  You may specify the image in any format that Docker accepts, such as "arvados/jobs" or a hash identifier.|✓|
+|docker_image|string|The name of a Docker image that this Job needs to run.  If specified, Crunch will create a Docker container from this image, and run the Job's script inside that.  The Keep mount and work directories will be available as volumes inside this container.  You may specify the image in any format that Docker accepts, such as "arvados/jobs" or a hash identifier.  If you specify a name, Crunch will try to install the latest version using @docker.io pull at .|✓|
 |min_nodes|integer||✓|
 |max_nodes|integer|||
 |max_tasks_per_node|integer|Maximum simultaneous tasks on a single node|✓|
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 0a06686..14b1be9 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -515,7 +515,9 @@ if ($docker_image) {
     freeze_if_want_freeze ($docker_pid);
     select (undef, undef, undef, 0.1);
   }
-  if ($? != 0)
+  # If the Docker image was specified as a hash, pull will fail.
+  # Ignore that error.  We'll see what happens when we try to run later.
+  if (($? != 0) && ($docker_image !~ /^[0-9a-fA-F]{5,}$/))
   {
     croak("Installing Docker image $docker_image returned exit code $?");
   }

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


hooks/post-receive
--