[ARVADOS] created: 2ce42bc1b881972753b77d4e3f4de8355d947063

[Git user]

        at  2ce42bc1b881972753b77d4e3f4de8355d947063 (commit)


commit 2ce42bc1b881972753b77d4e3f4de8355d947063
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jun 13 16:31:49 2016 -0400

    8442: Enable net when API is enabled.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index f558345..d508ffb 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -482,10 +482,11 @@ func (runner *ContainerRunner) CreateContainer() error {
 			"ARVADOS_API_HOST="+os.Getenv("ARVADOS_API_HOST"),
 			"ARVADOS_API_HOST_INSECURE="+os.Getenv("ARVADOS_API_HOST_INSECURE"),
 		)
+		runner.ContainerConfig.NetworkDisabled = false
+	} else {
+		runner.ContainerConfig.NetworkDisabled = true
 	}
 
-	runner.ContainerConfig.NetworkDisabled = true
-
 	var err error
 	runner.ContainerID, err = runner.Docker.CreateContainer(&runner.ContainerConfig, "", nil)
 	if err != nil {

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


hooks/post-receive
--