[ARVADOS] updated: 005cb811d937fe52cee11d76484252ed7167f9a8

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  005cb811d937fe52cee11d76484252ed7167f9a8 (commit)
      from  6a370a002d008dffaf9f47b7db3da47b40e57254 (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 005cb811d937fe52cee11d76484252ed7167f9a8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Dec 16 13:38:02 2016 -0500

    10684: Don't overwrite default certs search path unless -ca-certs provided.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 10b3a61..ebee1a8 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -912,12 +912,14 @@ func main() {
 	cgroupRoot := flag.String("cgroup-root", "/sys/fs/cgroup", "path to sysfs cgroup tree")
 	cgroupParent := flag.String("cgroup-parent", "docker", "name of container's parent cgroup (ignored if -cgroup-parent-subsystem is used)")
 	cgroupParentSubsystem := flag.String("cgroup-parent-subsystem", "", "use current cgroup for given subsystem as parent cgroup for container")
-	caCertsPath := flag.String("ca-certs", "/etc/arvados/ca-certificates.crt", "Path to TLS root certificates")
+	caCertsPath := flag.String("ca-certs", "", "Path to TLS root certificates")
 	flag.Parse()
 
 	containerId := flag.Arg(0)
 
-	arvadosclient.CertFiles = []string{*caCertsPath}
+	if *caCertsPath != "" {
+		arvadosclient.CertFiles = []string{*caCertsPath}
+	}
 
 	api, err := arvadosclient.MakeArvadosClient()
 	if err != nil {

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


hooks/post-receive
--