diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-03 18:46:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 18:46:35 +0200 |
| commit | fde0dc2a55b27b24e89100da3c2c9d52044a8208 (patch) | |
| tree | 972905f61ed128c6a138741fe25c78f279fbbf25 /libpod/image/pull.go | |
| parent | 0eaba2d56a48c68e1d08e287a1c9eb5405cc743a (diff) | |
| parent | d1a7378aa06eb3cc6ff02c3ca90356bf9a151ada (diff) | |
| download | podman-fde0dc2a55b27b24e89100da3c2c9d52044a8208.tar.gz podman-fde0dc2a55b27b24e89100da3c2c9d52044a8208.tar.bz2 podman-fde0dc2a55b27b24e89100da3c2c9d52044a8208.zip | |
Merge pull request #3064 from rhatdan/sysregistriesv2
change from sysregistries to sysregistriesv2
Diffstat (limited to 'libpod/image/pull.go')
| -rw-r--r-- | libpod/image/pull.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 5a0706b07..cb7411ce5 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -13,7 +13,6 @@ import ( dockerarchive "github.com/containers/image/docker/archive" "github.com/containers/image/docker/tarfile" ociarchive "github.com/containers/image/oci/archive" - "github.com/containers/image/pkg/sysregistries" is "github.com/containers/image/storage" "github.com/containers/image/transports" "github.com/containers/image/transports/alltransports" @@ -284,9 +283,8 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa } // 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{SystemRegistriesConfPath: systemRegistriesConfPath}) if goal.usedSearchRegistries && len(goal.searchedRegistries) == 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("image name provided is a short name and no search registries are defined in the registries config file.") } // If the image passed in was fully-qualified, we will have 1 refpair. Bc the image is fq'd, we dont need to yap about registries. if !goal.usedSearchRegistries { |