Parcourir la source

Removes the feature to pull all image aliases.

It didn't work on v2 anyways. And an image with a lot of aliases was slow to
fetch.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Jessica Frazelle il y a 10 ans
Parent
commit
72a9000fcf
2 fichiers modifiés avec 2 ajouts et 5 suppressions
  1. 1 2
      docs/sources/reference/commandline/cli.md
  2. 1 3
      graph/pull.go

+ 1 - 2
docs/sources/reference/commandline/cli.md

@@ -1474,8 +1474,7 @@ To download a particular image, or set of images (i.e., a repository),
 use `docker pull`:
 use `docker pull`:
 
 
     $ sudo docker pull debian
     $ sudo docker pull debian
-    # will pull the debian:latest image, its intermediate layers
-    # and any aliases of the same id
+    # will pull the debian:latest image and its intermediate layers
     $ sudo docker pull debian:testing
     $ sudo docker pull debian:testing
     # will pull the image named debian:testing and any intermediate
     # will pull the image named debian:testing and any intermediate
     # layers it is based on.
     # layers it is based on.

+ 1 - 3
graph/pull.go

@@ -132,7 +132,6 @@ func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *
 
 
 	log.Debugf("Registering tags")
 	log.Debugf("Registering tags")
 	// If no tag has been specified, pull them all
 	// If no tag has been specified, pull them all
-	var imageId string
 	if askedTag == "" {
 	if askedTag == "" {
 		for tag, id := range tagsList {
 		for tag, id := range tagsList {
 			repoData.ImgList[id].Tag = tag
 			repoData.ImgList[id].Tag = tag
@@ -143,7 +142,6 @@ func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *
 		if !exists {
 		if !exists {
 			return fmt.Errorf("Tag %s not found in repository %s", askedTag, repoInfo.CanonicalName)
 			return fmt.Errorf("Tag %s not found in repository %s", askedTag, repoInfo.CanonicalName)
 		}
 		}
-		imageId = id
 		repoData.ImgList[id].Tag = askedTag
 		repoData.ImgList[id].Tag = askedTag
 	}
 	}
 
 
@@ -247,7 +245,7 @@ func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *
 
 
 	}
 	}
 	for tag, id := range tagsList {
 	for tag, id := range tagsList {
-		if askedTag != "" && id != imageId {
+		if askedTag != "" && tag != askedTag {
 			continue
 			continue
 		}
 		}
 		if err := s.Set(repoInfo.LocalName, tag, id, true); err != nil {
 		if err := s.Set(repoInfo.LocalName, tag, id, true); err != nil {