Use either the system root pool or an empty cert pool with custom CA roots,

and not a joint system+custom CA roots pool, when connecting from a docker
client to a remote daemon.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: bf7766bfe8fe92f727ddf500ff8b9eb32fb367ab
Component: engine
This commit is contained in:
Ying Li
2017-03-09 11:19:20 -08:00
parent d242c08875
commit a8ad10558c
+3 -2
View File
@@ -243,8 +243,9 @@ func newHTTPClient(host string, tlsOptions *tlsconfig.Options) (*http.Client, er
// let the api client configure the default transport.
return nil, nil
}
config, err := tlsconfig.Client(*tlsOptions)
opts := *tlsOptions
opts.ExclusiveRootPools = true
config, err := tlsconfig.Client(opts)
if err != nil {
return nil, err
}