[ARVADOS] updated: 2fa70753122b53e70005c8f7d2d9b0f12588aa2e

Git user git at public.curoverse.com
Thu Mar 31 18:25:15 EDT 2016


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

       via  2fa70753122b53e70005c8f7d2d9b0f12588aa2e (commit)
      from  98ada97aef7838001ba87af08761b3abd5b011bb (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 2fa70753122b53e70005c8f7d2d9b0f12588aa2e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Mar 31 17:25:05 2016 -0400

    8828: Fix bind mount point for certificates.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 1145e29..689609d 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -854,8 +854,8 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
         ."&& MEMLIMIT=\$(( (\$MEM * 95) / ($ENV{CRUNCH_NODE_SLOTS} * 100) )) "
         ."&& let SWAPLIMIT=\$MEMLIMIT+\$SWAP "
         ."&& if which crunchrunner >/dev/null ; then VOLUME_CRUNCHRUNNER=\"--volume=\$(which crunchrunner):/usr/local/bin/crunchrunner\" ; fi "
-        ."&& if test -f /etc/ssl/certs/ca-certificates.crt ; then VOLUME_CERTS=\"--volume=/etc/ssl/certs/ca-certificates.crt\" ; fi "
-        ."&& if test -f /etc/pki/tls/certs/ca-bundle.crt ; then VOLUME_CERTS=\"--volume=/etc/pki/tls/certs/ca-bundle.crt\" ; fi ";
+        ."&& if test -f /etc/ssl/certs/ca-certificates.crt ; then VOLUME_CERTS=\"--volume=/etc/ssl/certs/ca-certificates.crt:/etc/arvados/ca-certificates.crt\" ; fi "
+        ."&& if 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