Kaynağa Gözat

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

Removing DockerCli.pullImage as it's never used
David Calavera 9 yıl önce
ebeveyn
işleme
0524a9783d
1 değiştirilmiş dosya ile 2 ekleme ve 6 silme
  1. 2 6
      api/client/create.go

+ 2 - 6
api/client/create.go

@@ -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 {
-	return cli.pullImageCustomOut(image, cli.out)
-}
-
-func (cli *DockerCli) pullImageCustomOut(image string, out io.Writer) error {
+func (cli *DockerCli) pullImage(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 {