Skip to content

can't set default schema to tcp for docker host param #1442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lifubang wants to merge 3 commits into from
Closed

can't set default schema to tcp for docker host param #1442

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b577b0
Merge pull request #1287 from adshmh/refactor-stack-list-unit-tests
silvin-lubecki Sep 20, 2018
cce1201
Merge remote-tracking branch 'github/master'
lifubang Oct 12, 2018
ed001af
set default schema to tcp when no schema in dockerhost param
lifubang Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions cli/command/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,23 +274,23 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, isTrusted bool, containe

// NewAPIClientFromFlags creates a new APIClient from command line flags
func NewAPIClientFromFlags(opts *cliflags.CommonOptions, configFile *configfile.ConfigFile) (client.APIClient, error) {
unparsedHost, err := getUnparsedServerHost(opts.Hosts)
if err != nil {
return &client.Client{}, err
}
var clientOpts []func(*client.Client) error
helper, err := connhelper.GetConnectionHelper(unparsedHost)
if err != nil {
return &client.Client{}, err
}
if helper == nil {
host, errp := getServerHost(opts.Hosts, opts.TLSOptions)
if errp == nil {
clientOpts = append(clientOpts, withHTTPClient(opts.TLSOptions))
host, err := dopts.ParseHost(opts.TLSOptions != nil, unparsedHost)
clientOpts = append(clientOpts, client.WithHost(host))
} else {
unparsedHost, err := getUnparsedServerHost(opts.Hosts)
if err != nil {
return &client.Client{}, err
}
clientOpts = append(clientOpts, client.WithHost(host))
} else {
helper, err := connhelper.GetConnectionHelper(unparsedHost)
if err != nil {
return &client.Client{}, err
}
if helper == nil {
return &client.Client{}, errp
}
clientOpts = append(clientOpts, func(c *client.Client) error {
httpClient := &http.Client{
// No tls
Expand Down Expand Up @@ -321,6 +321,20 @@ func NewAPIClientFromFlags(opts *cliflags.CommonOptions, configFile *configfile.
return client.NewClientWithOpts(clientOpts...)
}

func getServerHost(hosts []string, tlsOptions *tlsconfig.Options) (string, error) {
var host string
switch len(hosts) {
case 0:
host = os.Getenv("DOCKER_HOST")
case 1:
host = hosts[0]
default:
return "", errors.New("Please specify only one -H")
}

return dopts.ParseHost(tlsOptions != nil, host)
}

func getUnparsedServerHost(hosts []string) (string, error) {
var host string
switch len(hosts) {
Expand Down