[ARVADOS] updated: 86996de865c2b4d395c2a3977b05f7278924f627

Git user git at public.curoverse.com
Wed Apr 6 22:16:36 EDT 2016


Summary of changes:
 sdk/cli/bin/crunch-job | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

       via  86996de865c2b4d395c2a3977b05f7278924f627 (commit)
      from  ae6ced575905d226963516bb7780c2bae391621c (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 86996de865c2b4d395c2a3977b05f7278924f627
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Apr 6 22:16:33 2016 -0400

    Remove over-quoting from crunchrunner and certificate volume mounts.  refs #8893

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index c831be8..b4cb214 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -865,9 +865,9 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
         # $VOLUME_CRUNCHRUNNER and $VOLUME_CERTS will be passed unquoted as
         # arguments to `docker run`.  They must contain their own quoting.
         .q{&& VOLUME_CRUNCHRUNNER="" VOLUME_CERTS="" }
-        .q{&& if which crunchrunner >/dev/null ; then VOLUME_CRUNCHRUNNER=\\"--volume=$(which crunchrunner):/usr/local/bin/crunchrunner\\" ; fi }
-        .q{&& if test -f /etc/ssl/certs/ca-certificates.crt ; then VOLUME_CERTS=\\"--volume=/etc/ssl/certs/ca-certificates.crt:/etc/arvados/ca-certificates.crt\\" ; }
-        .q{elif test -f /etc/pki/tls/certs/ca-bundle.crt ; then VOLUME_CERTS=\\"--volume=/etc/pki/tls/certs/ca-bundle.crt:/etc/arvados/ca-certificates.crt\\" ; fi };
+        .q{&& if which crunchrunner >/dev/null ; then VOLUME_CRUNCHRUNNER=--volume=$(which crunchrunner):/usr/local/bin/crunchrunner ; fi }
+        .q{&& if test -f /etc/ssl/certs/ca-certificates.crt ; then VOLUME_CERTS=--volume=/etc/ssl/certs/ca-certificates.crt:/etc/arvados/ca-certificates.crt ; }
+        .q{elif test -f /etc/pki/tls/certs/ca-bundle.crt ; then VOLUME_CERTS=--volume=/etc/pki/tls/certs/ca-bundle.crt:/etc/arvados/ca-certificates.crt ; fi };
 
     $command .= "&& exec arv-mount --read-write --mount-by-pdh=by_pdh --mount-tmp=tmp --crunchstat-interval=10 --allow-other $arv_file_cache \Q$keep_mnt\E --exec ";
     $ENV{TASK_KEEPMOUNT} = "$keep_mnt/by_pdh";

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list