arvados-cli 0.1.20140807164620 → 0.1.20140808135152

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4cfcfb3b7d29ae96ca9b65c567f549d3b68c1d3
-  data.tar.gz: b3d7a1194b800d3ad615ca4948e57c30f62b96c8
+  metadata.gz: be86bee39e46832415ed4640e405ee778a15330f
+  data.tar.gz: d4304fcf4fa668e4a3018db3ec2c7743bc69aa2d
 SHA512:
-  metadata.gz: 5c20b291e5f1fc4920996eae6e37c6965e7dce03f3f144696dd87a6600104bfddb8027feb80dcfd898be04a154d908918d7d7bb647cc96196fccba1197d84641
-  data.tar.gz: e363bc826b9224940fc740028f791c52f7329d29d84fe34b6b0272da5cf035ce1ca35ad2ee944be5b4754b6bab2607ddb189d5ac9c61af9bfc370b99e762872f
+  metadata.gz: e429f432db9046e3a0279377fd6f62d8875fcc423787f59cddf0964c5b18bbd8b4eb13bcc67b25dfefcdbb6e0a2abef30762328c80a9d319c25c0f5c25c5f62e
+  data.tar.gz: d7a73c64743d2a71c959cf5c7b91e0b981329f9574552efe5dbb92d23eeca01533e9ce51ed7d4552a864041a2bfdda3b9dc992ab1e7fec22a06c6a7db4484d3b

data/bin/crunch-job

@@ -499,16 +499,17 @@ if (!$have_slurm)
 
 # If this job requires a Docker image, install that.
 my $docker_bin = "/usr/bin/docker.io";
-my ($docker_locator, $docker_hash);
+my ($docker_locator, $docker_stream, $docker_hash);
 if ($docker_locator = $Job->{docker_image_locator}) {
-  $docker_hash = find_docker_hash($docker_locator);
+  ($docker_stream, $docker_hash) = find_docker_image($docker_locator);
   if (!$docker_hash)
   {
     croak("No Docker image hash found from locator $docker_locator");
   }
+  $docker_stream =~ s/^\.//;
   my $docker_install_script = qq{
 if ! $docker_bin images -q --no-trunc | grep -qxF \Q$docker_hash\E; then
-    arv-get \Q$docker_locator/$docker_hash.tar\E | $docker_bin load
+    arv-get \Q$docker_locator$docker_stream/$docker_hash.tar\E | $docker_bin load
 fi
 };
   my $docker_pid = fork();
@@ -1466,19 +1467,19 @@ sub must_lock_now
   }
 }
 
-sub find_docker_hash {
-  # Given a Keep locator, search for a matching link to find the Docker hash
-  # of the stored image.
+sub find_docker_image {
+  # Given a Keep locator, check to see if it contains a Docker image.
+  # If so, return its stream name and Docker hash.
+  # If not, return undef for both values.
   my $locator = shift;
-  my $links_result = $arv->{links}->{list}->execute(
-    filters => [["head_uuid", "=", $locator],
-                ["link_class", "=", "docker_image_hash"]],
-    limit => 1);
-  my $docker_hash;
-  foreach my $link (@{$links_result->{items}}) {
-    $docker_hash = lc($link->{name});
+  if (my $image = $arv->{collections}->{get}->execute(uuid => $locator)) {
+    my @file_list = @{$image->{files}};
+    if ((scalar(@file_list) == 1) &&
+        ($file_list[0][1] =~ /^([0-9A-Fa-f]{64})\.tar$/)) {
+      return ($file_list[0][0], $1);
+    }
   }
-  return $docker_hash;
+  return (undef, undef);
 }
 
 __DATA__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140807164620
+  version: 0.1.20140808135152
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision a15f61aef5f26dc6d0bb3e6ab02428b1d2a87ae8
+description: This is the Arvados SDK CLI gem, git revision eef298a7cf58771583b255fb0e3e1cfcbcdb6e48
 email: gem-dev@curoverse.com
 executables:
 - arv