Merge pull request #363 from debovema/master

Quentin Perez · Quentin Perez · commit a428f5ac0220 · 2016-06-02T13:57:20.000+02:00
Use proxy configuration from environment in 'scw attach' command
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -203,6 +203,8 @@ func AttachToSerial(serverID string, apiToken string) (*gottyclient.Client, chan
 		gottycli.SkipTLSVerify = true
 	}
 
+	gottycli.UseProxyFromEnv = true
+
 	if err = gottycli.Connect(); err != nil {
 		return nil, nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,8 @@ func AttachToSerial(serverID string, apiToken string) (*gottyclient.Client, chan`
`203`	`203`	`gottycli.SkipTLSVerify = true`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ gottycli.UseProxyFromEnv = true`
	`207`	`+`
`206`	`208`	`if err = gottycli.Connect(); err != nil {`
`207`	`209`	`return nil, nil, err`
`208`	`210`	`}`