projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1a09083
)
Set $CRUNCH_SRC correctly when running the Docker container. refs #3370
author
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 28 Jul 2014 13:13:59 +0000
(09:13 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 28 Jul 2014 13:13:59 +0000
(09:13 -0400)
sdk/cli/bin/crunch-job
patch
|
blob
|
history
diff --git
a/sdk/cli/bin/crunch-job
b/sdk/cli/bin/crunch-job
index 462b78c5f8a8f056e0acd21a4bc25c1651ae0fda..30f06b8cab92bbd17689cd951d64d3f3abf0c148 100755
(executable)
--- a/
sdk/cli/bin/crunch-job
+++ b/
sdk/cli/bin/crunch-job
@@
-668,15
+668,13
@@
for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
elsif ($env_key eq "TASK_KEEPMOUNT") {
$command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
}
elsif ($env_key eq "TASK_KEEPMOUNT") {
$command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
}
- elsif ($env_key eq "CRUNCH_SRC") {
- $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
- }
else {
$command .= "--env=\Q$env_key=$env_val\E ";
}
}
}
$command .= "--env=\QCRUNCH_NODE_SLOTS=$ENV{CRUNCH_NODE_SLOTS}\E ";
else {
$command .= "--env=\Q$env_key=$env_val\E ";
}
}
}
$command .= "--env=\QCRUNCH_NODE_SLOTS=$ENV{CRUNCH_NODE_SLOTS}\E ";
+ $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
$command .= "\Q$docker_hash\E ";
$command .= "stdbuf --output=0 --error=0 ";
$command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};
$command .= "\Q$docker_hash\E ";
$command .= "stdbuf --output=0 --error=0 ";
$command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};