diff options
| -rw-r--r-- | libpod/image/pull.go | 28 | ||||
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/image/docker/daemon/client.go | 6 | ||||
| -rw-r--r-- | vendor/github.com/containers/image/pkg/sysregistries/system_registries.go | 24 | ||||
| -rw-r--r-- | vendor/github.com/containers/image/vendor.conf | 6 |
5 files changed, 49 insertions, 17 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go index cd915cb47..48513509d 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -225,7 +225,23 @@ func (i *Image) pullImage(ctx context.Context, writer io.Writer, authfile, signa images = append(images, imageInfo.image) } } - return images, errors.Wrapf(err, "error pulling image from") + // If no image was found, we should handle. Lets be nicer to the user and see if we can figure out why. + if len(images) == 0 { + registryPath := sysregistries.RegistriesConfPath(&types.SystemContext{}) + searchRegistries, err := registries.GetRegistries() + if err != nil { + return nil, err + } + hasRegistryInName, err := i.hasRegistry() + if err != nil { + return nil, err + } + if !hasRegistryInName && len(searchRegistries) == 0 { + return nil, errors.Errorf("image name provided is a short name and no search registries are defined in %s.", registryPath) + } + return nil, errors.Errorf("unable to find image in the registries defined in %q", registryPath) + } + return images, nil } // createNamesToPull looks at a decomposed image and determines the possible @@ -281,3 +297,13 @@ func (i *Image) createNamesToPull() ([]*pullStruct, error) { return pullNames, nil } + +// isShortName returns a bool response if the input image name has a registry +// name in it or not +func (i *Image) isShortName() (bool, error) { + decomposedImage, err := decompose(i.InputName) + if err != nil { + return false, err + } + return decomposedImage.hasRegistry, nil +} diff --git a/vendor.conf b/vendor.conf index 2c1888c7a..6f20bc1e5 100644 --- a/vendor.conf +++ b/vendor.conf @@ -10,7 +10,7 @@ github.com/containerd/cgroups 77e628511d924b13a77cebdc73b757a47f6d751b github.com/containerd/continuity master github.com/containernetworking/cni v0.6.0 github.com/containernetworking/plugins 1fb94a4222eafc6f948eacdca9c9f2158b427e53 -github.com/containers/image 3143027065e31d25d8d2b6fe84b250a320fd9130 +github.com/containers/image ad33f7b73fbac0acf05b9e2cea021b61b4b0c3e0 github.com/containers/storage 0b8ab959bba614a4f88bb3791dbc078c3d47f259 github.com/coreos/go-systemd v14 github.com/cri-o/ocicni master diff --git a/vendor/github.com/containers/image/docker/daemon/client.go b/vendor/github.com/containers/image/docker/daemon/client.go index 3d5317a45..26f1b03b7 100644 --- a/vendor/github.com/containers/image/docker/daemon/client.go +++ b/vendor/github.com/containers/image/docker/daemon/client.go @@ -30,13 +30,13 @@ func newDockerClient(sys *types.SystemContext) (*dockerclient.Client, error) { // // Similarly, if we want to communicate over plain HTTP on a TCP socket, we also need to set // TLSClientConfig to nil. This can be achieved by using the form `http://` - proto, _, _, err := dockerclient.ParseHost(host) + url, err := dockerclient.ParseHostURL(host) if err != nil { return nil, err } var httpClient *http.Client - if proto != "unix" { - if proto == "http" { + if url.Scheme != "unix" { + if url.Scheme == "http" { httpClient = httpConfig() } else { hc, err := tlsConfig(sys) diff --git a/vendor/github.com/containers/image/pkg/sysregistries/system_registries.go b/vendor/github.com/containers/image/pkg/sysregistries/system_registries.go index a0aa6c643..09b419cc8 100644 --- a/vendor/github.com/containers/image/pkg/sysregistries/system_registries.go +++ b/vendor/github.com/containers/image/pkg/sysregistries/system_registries.go @@ -42,16 +42,7 @@ func normalizeRegistries(regs *registries) { // Reads the global registry file from the filesystem. Returns // a byte array func readRegistryConf(sys *types.SystemContext) ([]byte, error) { - dirPath := systemRegistriesConfPath - if sys != nil { - if sys.SystemRegistriesConfPath != "" { - dirPath = sys.SystemRegistriesConfPath - } else if sys.RootForImplicitAbsolutePaths != "" { - dirPath = filepath.Join(sys.RootForImplicitAbsolutePaths, systemRegistriesConfPath) - } - } - configBytes, err := ioutil.ReadFile(dirPath) - return configBytes, err + return ioutil.ReadFile(RegistriesConfPath(sys)) } // For mocking in unittests @@ -97,3 +88,16 @@ func GetInsecureRegistries(sys *types.SystemContext) ([]string, error) { } return config.Registries.Insecure.Registries, nil } + +// RegistriesConfPath is the path to the system-wide registry configuration file +func RegistriesConfPath(ctx *types.SystemContext) string { + path := systemRegistriesConfPath + if ctx != nil { + if ctx.SystemRegistriesConfPath != "" { + path = ctx.SystemRegistriesConfPath + } else if ctx.RootForImplicitAbsolutePaths != "" { + path = filepath.Join(ctx.RootForImplicitAbsolutePaths, systemRegistriesConfPath) + } + } + return path +} diff --git a/vendor/github.com/containers/image/vendor.conf b/vendor/github.com/containers/image/vendor.conf index f2e69e903..123bde98a 100644 --- a/vendor/github.com/containers/image/vendor.conf +++ b/vendor/github.com/containers/image/vendor.conf @@ -5,10 +5,11 @@ github.com/containers/storage master github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1 github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716 -github.com/docker/docker 30eb4d8cdc422b023d5f11f29a82ecb73554183b -github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d +github.com/docker/docker da99009bbb1165d1ac5688b5c81d2f589d418341 +github.com/docker/go-connections 7beb39f0b969b075d1325fecb092faf27fd357b6 github.com/docker/go-units 0dadbb0345b35ec7ef35e228dabb8de89a65bf52 github.com/docker/libtrust aabc10ec26b754e797f9028f4589c5b7bd90dc20 +github.com/containerd/continuity d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371 github.com/ghodss/yaml 04f313413ffd65ce25f2541bfd2b2ceec5c0908c github.com/gorilla/mux 94e7d24fd285520f3d12ae998f7fdd6b5393d453 github.com/imdario/mergo 50d4dbd4eb0e84778abe37cefef140271d96fade @@ -38,3 +39,4 @@ github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0 github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460 github.com/gogo/protobuf fcdc5011193ff531a548e9b0301828d5a5b97fd8 github.com/pquerna/ffjson master +github.com/syndtr/gocapability master |