github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1331 from erikwilson/fix-http-localhost

Browse Source 
Fix using `http` for localhost, 127.0.0.1 and ::1 by default
This commit is contained in:
Lantao Liu 2019-11-01 00:09:53 -07:00 committed by GitHub
commit 9f79be1b88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/server/image_pull.go
View File

@ -310,10 +310,6 @@ func (c *criService) registryHosts(auth *runtime.AuthConfig) docker.RegistryHost
config = c.config.Registry.Configs[u.Host] config = c.config.Registry.Configs[u.Host]
) )
if u.Scheme == "" {
u.Scheme = defaultScheme(u.Host)
}
if u.Scheme != "https" && config.TLS != nil { if u.Scheme != "https" && config.TLS != nil {
return nil, errors.Errorf("tls provided for http endpoint %q", e) return nil, errors.Errorf("tls provided for http endpoint %q", e)
} }
@ -355,8 +351,7 @@ func defaultScheme(host string) string {
if h, _, err := net.SplitHostPort(host); err == nil { if h, _, err := net.SplitHostPort(host); err == nil {
host = h host = h
} }
if host == "localhost" || host == "127.0.0.1" || if host == "localhost" || host == "127.0.0.1" || host == "::1" {
host == "::1" {
return "http" return "http"
} }
return "https" return "https"
@ -387,7 +382,7 @@ func (c *criService) registryEndpoints(host string) ([]string, error) {
return endpoints, nil return endpoints, nil
} }
} }
return append(endpoints, "https://"+defaultHost), nil return append(endpoints, defaultScheme(defaultHost)+"://"+defaultHost), nil
} }
// newTransport returns a new HTTP transport used to pull image. // newTransport returns a new HTTP transport used to pull image.