arvados-cli 0.1.20140703223044 → 0.1.20140703225421

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68077d388b83c7af32c3fdabc3fdbf12a306e13f
-  data.tar.gz: 1a7ce3c538b7e5a1488af4c99c9fe3e196436686
+  metadata.gz: e80ce079a5507b67f6af1b109ff6811b6f8ffd7d
+  data.tar.gz: fa71de21a72f20d70c43882bc999430aa6752f51
 SHA512:
-  metadata.gz: 3dbcb5227367b429c95af258a0b2b72d987f1b15effb52189662d55fa1f1a7ddb8509dea67d0ed76e68d462f5b6ce557bd436a5260cb165dea459ee989df14cb
-  data.tar.gz: 113b5728118f34e1429d22edbc52705d100b089c10ad22b018b4fb28a2455f638071434e04a8ad7a95fbc39666dfa39e6ab6258e83810ea2c0bd5de5cf49c7eb
+  metadata.gz: 9c48247950beae51d576a600882dc26f1bb038da95744bffdcb33bd43efb70e3d8dddb2a956a405d7be04676271d7cac9bd71cc4da3e259ae8eef29f7f0cf311
+  data.tar.gz: 058f683ae6106d13cff5f27418d95227f7fb33ebb5d322f4c95f33baf2b8cdee77879b6a14db68764af7c35edddef82144acf15ccc51fb9c683ce6d7d59052fb

data/bin/crunch-job

@@ -639,8 +639,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     my $build_script_to_send = "";
     my $command =
 	"if [ -e $ENV{TASK_WORK} ]; then rm -rf $ENV{TASK_WORK}; fi; "
-        ."mkdir -p $ENV{JOB_WORK} $ENV{CRUNCH_TMP} $ENV{TASK_WORK} $ENV{TASK_KEEPMOUNT} "
-        ."&& chmod og+wrx $ENV{TASK_WORK}"
+        ."mkdir -p $ENV{JOB_WORK} $ENV{CRUNCH_TMP} $ENV{TASK_WORK} $ENV{TASK_KEEPMOUNT}"
 	."&& cd $ENV{CRUNCH_TMP} ";
     if ($build_script)
     {
@@ -652,41 +651,40 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     if ($docker_hash)
     {
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$ENV{TASK_WORK}/docker.cid -poll=10000 ";
-      $command .= "$docker_bin run -i -a stdin -a stdout -a stderr --cidfile=$ENV{TASK_WORK}/docker.cid ";
+      $command .= "$docker_bin run --rm=true --attach=stdout --attach=stderr --user=crunch --cidfile=$ENV{TASK_WORK}/docker.cid ";
       # Dynamically configure the container to use the host system as its
       # DNS server.  Get the host's global addresses from the ip command,
       # and turn them into docker --dns options using gawk.
       $command .=
           q{$(ip -o address show scope global |
               gawk 'match($4, /^([0-9\.:]+)\//, x){print "--dns", x[1]}') };
-      $command .= "-v \Q$ENV{TASK_WORK}:/tmp/crunch-job:rw\E ";
-      $command .= "-v \Q$ENV{CRUNCH_SRC}:/tmp/crunch-src:ro\E ";
-      $command .= "-v \Q$ENV{TASK_KEEPMOUNT}:/mnt:ro\E ";
-      $command .= "-e \QHOME=/tmp/crunch-job\E ";
+      $command .= "--volume=\Q$ENV{CRUNCH_SRC}:/tmp/crunch-src:ro\E ";
+      $command .= "--volume=\Q$ENV{TASK_KEEPMOUNT}:/keep:ro\E ";
+      $command .= "--env=\QHOME=/home/crunch\E ";
       while (my ($env_key, $env_val) = each %ENV)
       {
         if ($env_key =~ /^(ARVADOS|JOB|TASK)_/) {
           if ($env_key eq "TASK_WORK") {
-            $command .= "-e \QTASK_WORK=/tmp/crunch-job\E ";
+            $command .= "--env=\QTASK_WORK=/tmp/crunch-job\E ";
           }
           elsif ($env_key eq "TASK_KEEPMOUNT") {
-            $command .= "-e \QTASK_KEEPMOUNT=/mnt\E ";
+            $command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
           }
           elsif ($env_key eq "CRUNCH_SRC") {
-            $command .= "-e \QCRUNCH_SRC=/tmp/crunch-src\E ";
+            $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
           }
           else {
-            $command .= "-e \Q$env_key=$env_val\E ";
+            $command .= "--env=\Q$env_key=$env_val\E ";
           }
         }
       }
       $command .= "\Q$docker_hash\E ";
-      $command .= "stdbuf -o0 -e0 ";
+      $command .= "stdbuf --output=0 --error=0 ";
       $command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};
     } else {
       # Non-docker run
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -poll=10000 ";
-      $command .= "stdbuf -o0 -e0 ";
+      $command .= "stdbuf --output=0 --error=0 ";
       $command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140703223044
+  version: 0.1.20140703225421
 platform: ruby
 authors:
 - Arvados Authors
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision 69b45719b95e59c3293fd8a6003d72c4d0b9d9c7
+description: This is the Arvados SDK CLI gem, git revision b7de0ac72fe6e5270d58940f782e630789391f05
 email: gem-dev@curoverse.com
 executables:
 - arv