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

Consider endpoint path when checking default host.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2019-08-09 18:22:08 -07:00
parent a7481289bb
commit 005f9f7378
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/server/image_pull.go
View File

@@ -32,7 +32,6 @@ import (
containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/remotes/docker"
"github.com/containerd/cri/pkg/util"
distribution "github.com/docker/distribution/reference"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
@@ -336,15 +335,19 @@ func (c *criService) registryHosts(auth *runtime.AuthConfig) docker.RegistryHost
func addDefaultEndpoint(endpoints []string, host string) ([]string, error) {
defaultHost, err := docker.DefaultHost(host)
if err != nil {
return nil, errors.Wrapf(err, "get default host")
return nil, errors.Wrap(err, "get default host")
}
// If the http endpoint is configured, do not try https.
if !util.InStringSlice(endpoints, "http://"+defaultHost) {
if !util.InStringSlice(endpoints, "https://"+defaultHost) {
return append(endpoints, "https://"+defaultHost), nil
for _, e := range endpoints {
u, err := url.Parse(e)
if err != nil {
return nil, errors.Wrap(err, "parse endpoint url")
}
if u.Host == host {
// Do not add default if the endpoint already exists.
return endpoints, nil
}
}
return endpoints, nil
return append(endpoints, "https://"+defaultHost), nil
}
// newTransport returns a new HTTP transport used to pull image.