diff options
| author | Tonis Tiigi <tonistiigi@gmail.com> | 2016-09-02 18:27:20 -0700 |
|---|---|---|
| committer | Tonis Tiigi <tonistiigi@gmail.com> | 2016-09-02 19:07:54 -0700 |
| commit | 7a8c7b47cffa8485b03db715f78c087b01ae5dfa (patch) | |
| tree | 3242b66433c3d8e515c3618d8ad3d537c7843359 /registry/registry.go | |
| parent | f0e99972877f06904e0327e9537de8390b5cfb4b (diff) | |
| download | docker-7a8c7b47cffa8485b03db715f78c087b01ae5dfa.tar.gz | |
Fix govet for go1.7
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Diffstat (limited to 'registry/registry.go')
| -rw-r--r-- | registry/registry.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/registry/registry.go b/registry/registry.go index 973bff9f9a..a139981b02 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -28,19 +28,19 @@ var ( func newTLSConfig(hostname string, isSecure bool) (*tls.Config, error) { // PreferredServerCipherSuites should have no effect - tlsConfig := tlsconfig.ServerDefault + tlsConfig := tlsconfig.ServerDefault() tlsConfig.InsecureSkipVerify = !isSecure if isSecure && CertsDir != "" { hostDir := filepath.Join(CertsDir, cleanPath(hostname)) logrus.Debugf("hostDir: %s", hostDir) - if err := ReadCertsDirectory(&tlsConfig, hostDir); err != nil { + if err := ReadCertsDirectory(tlsConfig, hostDir); err != nil { return nil, err } } - return &tlsConfig, nil + return tlsConfig, nil } func hasFile(files []os.FileInfo, name string) bool { @@ -163,8 +163,7 @@ func addRequiredHeadersToRedirectedRequests(req *http.Request, via []*http.Reque // default TLS configuration. func NewTransport(tlsConfig *tls.Config) *http.Transport { if tlsConfig == nil { - var cfg = tlsconfig.ServerDefault - tlsConfig = &cfg + tlsConfig = tlsconfig.ServerDefault() } direct := &net.Dialer{ |