From f437b490b519beca9b3ece62d09bdbb384bcb009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Elsd=C3=B6rfer?= Date: Sun, 9 Mar 2014 03:32:21 +0100 Subject: [PATCH 1/2] Support DOCKER_HOST w/o protocol --- pkg/build/docker/client.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/build/docker/client.go b/pkg/build/docker/client.go index bb33a28fb..6be21568f 100644 --- a/pkg/build/docker/client.go +++ b/pkg/build/docker/client.go @@ -78,6 +78,8 @@ func (c *Client) setHost(defaultUnixSocket string) { if len(pieces) == 2 { c.proto = pieces[0] c.addr = pieces[1] + } else if len(pieces) == 1 { + c.addr = pieces[0] } } else { // if the default socket doesn't exist then @@ -121,7 +123,7 @@ func (c *Client) do(method, path string, in, out interface{}) error { // make the request conn := httputil.NewClientConn(dial, nil) - resp, err := conn.Do(req) + resp, err := conn.Do(req)el defer conn.Close() if err != nil { return err From 4130c013f15c27815746860e09ba5078c5c051c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Elsd=C3=B6rfer?= Date: Sun, 9 Mar 2014 03:38:27 +0100 Subject: [PATCH 2/2] Remove erroneous keystrokes. --- pkg/build/docker/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/docker/client.go b/pkg/build/docker/client.go index 6be21568f..a02300a7c 100644 --- a/pkg/build/docker/client.go +++ b/pkg/build/docker/client.go @@ -123,7 +123,7 @@ func (c *Client) do(method, path string, in, out interface{}) error { // make the request conn := httputil.NewClientConn(dial, nil) - resp, err := conn.Do(req)el + resp, err := conn.Do(req) defer conn.Close() if err != nil { return err