mirror of
https://github.com/containers/podman.git
synced 2025-06-19 16:33:24 +08:00
Better pull error for fully-qualified images
When pulling a fully-qualified image that fails, we should not be talking about registries/search registries in the the error message as it is not applicable. If a image that is fq'd and fails to pull, the error should be simplified. ``` $ sudo podman pull this-does-not-exist.example.com/foo Trying to pull this-does-not-exist.example.com/foo...Failed error pulling image "this-does-not-exist.example.com/foo": unable to pull this-does-not-exist.example.com/foo: unable to pull image, or you do not have pull access $ ``` Resolves: #1212 Signed-off-by: baude <bbaude@redhat.com> Closes: #1216 Approved by: mheon
This commit is contained in:
@ -272,7 +272,12 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa
|
|||||||
if goal.usedSearchRegistries && len(goal.searchedRegistries) == 0 {
|
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 %s.", registryPath)
|
||||||
}
|
}
|
||||||
|
// 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 {
|
||||||
|
return nil, errors.Errorf("unable to pull image, or you do not have pull access")
|
||||||
|
}
|
||||||
return nil, errors.Errorf("unable to find image on registries defined in %s, or you do not have pull access", registryPath)
|
return nil, errors.Errorf("unable to find image on registries defined in %s, or you do not have pull access", registryPath)
|
||||||
|
|
||||||
}
|
}
|
||||||
return images, nil
|
return images, nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user