toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix unix socket

Browse Source 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6ca144ef3d62e358327249546bf83ce1e347be5c
Component: engine
This commit is contained in:
Victor Vieux
2014-11-12 00:37:54 +00:00
parent f37e910c9f
commit ad5fd5c082
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/api/client/cli.go
View File

@ -144,8 +144,8 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, key libtrust.PrivateKey,
if proto == "unix" {
// no need in compressing for local communications
tr.DisableCompression = true
tr.Dial = func(network, addr string) (net.Conn, error) {
return net.DialTimeout("unix", addr, 32*time.Second)
tr.Dial = func(dial_network, dial_addr string) (net.Conn, error) {
return net.DialTimeout(proto, addr, 32*time.Second)
}
} else {
tr.Dial = (&net.Dialer{Timeout: 32 * time.Second}).Dial