kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #21508 from vdemeester/remove-client-unused-method

Browse source 
Removing DockerCli.pullImage as it's never used
This commit is contained in:
David Calavera 2016-03-25 13:52:49 -07:00
commit 0524a9783d
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/client/create.go
View file

@ -18,11 +18,7 @@ import (
networktypes "github.com/docker/engine-api/types/network" networktypes "github.com/docker/engine-api/types/network"
) )
func (cli *DockerCli) pullImage(image string) error { func (cli *DockerCli) pullImage(image string, out io.Writer) error {
return cli.pullImageCustomOut(image, cli.out)
}
func (cli *DockerCli) pullImageCustomOut(image string, out io.Writer) error {
ref, err := reference.ParseNamed(image) ref, err := reference.ParseNamed(image)
if err != nil { if err != nil {
return err return err
@ -119,7 +115,7 @@ func (cli *DockerCli) createContainer(config *container.Config, hostConfig *cont
fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.String()) fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", ref.String())
// we don't want to write to stdout anything apart from container.ID // we don't want to write to stdout anything apart from container.ID
if err = cli.pullImageCustomOut(config.Image, cli.err); err != nil { if err = cli.pullImage(config.Image, cli.err); err != nil {
return nil, err return nil, err
} }
if ref, ok := ref.(reference.NamedTagged); ok && trustedRef != nil { if ref, ok := ref.(reference.NamedTagged); ok && trustedRef != nil {