Skip to content
This repository has been archived by the owner on Jun 16, 2021. It is now read-only.

Commit

Permalink
Update docker version and client create arguments
Browse files Browse the repository at this point in the history
Signed-off-by: Beorn Facchini <beornf@gmail.com>
  • Loading branch information
beornf committed Aug 15, 2018
1 parent 6bb86d5 commit affa0e4
Show file tree
Hide file tree
Showing 329 changed files with 1,274 additions and 3,005 deletions.
23 changes: 9 additions & 14 deletions docker/client/client.go
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
4 changes: 2 additions & 2 deletions vendor/github.com/docker/docker/api/common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/common_unix.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/common_windows.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/types/auth.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/docker/docker/api/types/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 2 additions & 14 deletions vendor/github.com/docker/docker/api/types/configs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/types/events/events.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/types/filters/parse.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/types/mount/mount.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/types/seccomp.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/types/stats.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/types/swarm/common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion vendor/github.com/docker/docker/api/types/swarm/config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions vendor/github.com/docker/docker/api/types/swarm/container.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit affa0e4

Please sign in to comment.