arvados-cli 0.1.20170217221854 → 0.1.20170306153140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45435d65357352b05d8eebef46d89db815cb6365
-  data.tar.gz: a9ac69498675598739845ff3eda8f18630cb1d36
+  metadata.gz: dd64584b9e428c7707f189999534af8f6ded7779
+  data.tar.gz: 6f20fd2aba6a1b3d6eb66a9222db67fe36553237
 SHA512:
-  metadata.gz: e20d9966a940b8e6d895d98c54183da6b7c449229c2106da2cc1b2fab982efc1aa651d0ab8f110af5f2515564717e361a06539b8b86670e5c73d51e0b4b3586e
-  data.tar.gz: 18de405ef4002290a0a2b1edad432e3375cd4f7c93bf6bc93d016876503c1a0f555d010745dde360b306959fd4cc134c57f13f9470ea241783e60eb5731a65d9
+  metadata.gz: dcd47ed72777f78b542fc4571b275d10421b15902d87063ea16bc411cf43e4a871ba894068f76d7da42ad0c2b5244cee5fddd3d6a9e7899a2a03de42c7ed3852
+  data.tar.gz: e48a4707eba9148e108dcd90a494aaccb9857e5096acb55f83fa0d89b77e7b9ccfe1f81b6d438448b8256e72ef3b1cf413929a78dc1aaee51e6a69d1e4c20be7

data/bin/crunch-job

@@ -417,18 +417,22 @@ if ($docker_locator = $Job->{docker_image_locator}) {
   Log (undef, "docker image hash is $docker_hash");
   $docker_stream =~ s/^\.//;
   my $docker_install_script = qq{
-if $docker_bin images -q --no-trunc --all | grep -xF \Q$docker_hash\E >/dev/null; then
-    exit 0
+loaded() {
+  id=\$($docker_bin inspect --format="{{.ID}}" \Q$docker_hash\E) || return 1
+  echo "image ID is \$id"
+  [[ \${id} = \Q$docker_hash\E ]]
+}
+if loaded >&2 2>/dev/null; then
+  echo >&2 "image is already present"
+  exit 0
 fi
-declare -a exit_codes=("\${PIPESTATUS[@]}")
-if [ 0 != "\${exit_codes[0]}" ]; then
-   exit "\${exit_codes[0]}"  # `docker images` failed
-elif [ 1 != "\${exit_codes[1]}" ]; then
-   exit "\${exit_codes[1]}"  # `grep` encountered an error
-else
-   # Everything worked fine, but grep didn't find the image on this host.
-   arv-get \Q$docker_locator$docker_stream/$docker_hash.tar\E | $docker_bin load
+echo >&2 "docker image is not present; loading"
+arv-get \Q$docker_locator$docker_stream/$docker_hash.tar\E | $docker_bin load
+if ! loaded >&2; then
+  echo >&2 "`docker load` exited 0, but image is not found (!)"
+  exit 1
 fi
+echo >&2 "image loaded successfully"
 };
 
   my ($exited, $stdout, $stderr) = srun_sync(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20170217221854
+  version: 0.1.20170306153140
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -164,7 +164,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Arvados command line tools, git commit d0ba6eaac1387ad817de1c2df2d7f4f00800aaa5
+description: Arvados command line tools, git commit a4a3227c634d8cfd54a23205be727e910032cbe9
 email: gem-dev@curoverse.com
 executables:
 - arv