Added support for REPO:TAG format in docker pull (overrides -t option)

Upstream-commit: e81a53eea9d5a44c3fde8d3060845ca18e95b4c4 Component: engine
2013-05-06 10:56:47 -07:00
parent d98dd27286
commit a3a48a161a
1 changed files with 6 additions and 1 deletions
@@ -565,6 +565,12 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
 		return nil
 	}

+	if strings.Contains(remote, ":") {
+		remoteParts := strings.Split(remote, ":")
+		tag = &remoteParts[1]
+		remote = remoteParts[0]
+	}
+
 	// FIXME: CmdPull should be a wrapper around Runtime.Pull()
 	if *registry != "" {
 		if err := srv.runtime.graph.PullImage(stdout, remote, *registry, nil); err != nil {
@@ -572,7 +578,6 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
 		}
 		return nil
 	}
-	// FIXME: Allow pull repo:tag
 	if err := srv.runtime.graph.PullRepository(stdout, remote, *tag, srv.runtime.repositories, srv.runtime.authConfig); err != nil {
 		return err
 	}