Merge pull request #506 from beornf/docker-client

Update docker version and client create arguments

Author: Vincent Demeester

docker/client/client.go

@@ -10,7 +10,6 @@ import (
 	cliconfig "github.com/docker/cli/cli/config"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/homedir"
-	"github.com/docker/go-connections/sockets"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/docker/libcompose/version"
 )
@@ -87,27 +86,23 @@ func Create(c Options) (client.APIClient, error) {
 		if err != nil {
 			return nil, err
 		}
-		tr := &http.Transport{
-			TLSClientConfig: config,
-		}
-		proto, addr, _, err := client.ParseHost(c.Host)
-		if err != nil {
-			return nil, err
-		}
-
-		if err := sockets.ConfigureTransport(tr, proto, addr); err != nil {
-			return nil, err
-		}
 
 		httpClient = &http.Client{
-			Transport: tr,
+			Transport: &http.Transport{
+				TLSClientConfig: config,
+			},
 		}
 	}
 
 	customHeaders := map[string]string{}
 	customHeaders["User-Agent"] = fmt.Sprintf("Libcompose-Client/%s (%s)", version.VERSION, runtime.GOOS)
 
-	client, err := client.NewClient(c.Host, apiVersion, httpClient, customHeaders)
+	client, err := client.NewClientWithOpts(
+		client.WithHTTPClient(httpClient),
+		client.WithHost(c.Host),
+		client.WithVersion(apiVersion),
+		client.WithHTTPHeaders(customHeaders),
+	)
 	if err != nil {
 		return nil, err
 	}

vendor.conf

@@ -1,4 +1,4 @@
-github.com/docker/docker 7848b8beb9d38a98a78b75f78e05f8d2255f9dfe
+github.com/docker/docker 0ede01237c9ab871f1b8db0364427407f3e46541
 github.com/docker/cli 3352c0e137e80b7e10fb0efc9812df7bca9497a2
 github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c
 github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d