Merge pull request #30047 from duglin/distError

Add the mediaType to the error
This commit is contained in:
Tibor Vass 2017-03-10 16:44:49 -08:00 committed by GitHub
commit 2881566c4a
2 changed files with 2 additions and 2 deletions

View File

@ -76,7 +76,7 @@ func runPull(dockerCli *command.DockerCli, opts pullOptions) error {
err = imagePullPrivileged(ctx, dockerCli, authConfig, reference.FamiliarString(distributionRef), requestPrivilege, opts.all) err = imagePullPrivileged(ctx, dockerCli, authConfig, reference.FamiliarString(distributionRef), requestPrivilege, opts.all)
} }
if err != nil { if err != nil {
if strings.Contains(err.Error(), "target is plugin") { if strings.Contains(err.Error(), "when fetching 'plugin'") {
return errors.New(err.Error() + " - Use `docker plugin install`") return errors.New(err.Error() + " - Use `docker plugin install`")
} }
return err return err

View File

@ -144,7 +144,7 @@ func runInstall(dockerCli *command.DockerCli, opts pluginOptions) error {
} }
responseBody, err := dockerCli.Client().PluginInstall(ctx, localName, options) responseBody, err := dockerCli.Client().PluginInstall(ctx, localName, options)
if err != nil { if err != nil {
if strings.Contains(err.Error(), "target is image") { if strings.Contains(err.Error(), "(image) when fetching") {
return errors.New(err.Error() + " - Use `docker image pull`") return errors.New(err.Error() + " - Use `docker image pull`")
} }
return err return err