Browse code

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

shin- authored on 2013/04/30 22:55:24
Showing 1 changed files
... ...
@@ -565,6 +565,12 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
565 565
 		return nil
566 566
 	}
567 567
 
568
+	if strings.Contains(remote, ":") {
569
+		remoteParts := strings.Split(remote, ":")
570
+		tag = &remoteParts[1]
571
+		remote = remoteParts[0]
572
+	}
573
+
568 574
 	// FIXME: CmdPull should be a wrapper around Runtime.Pull()
569 575
 	if *registry != "" {
570 576
 		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
572 572
 		}
573 573
 		return nil
574 574
 	}
575
-	// FIXME: Allow pull repo:tag
576 575
 	if err := srv.runtime.graph.PullRepository(stdout, remote, *tag, srv.runtime.repositories, srv.runtime.authConfig); err != nil {
577 576
 		return err
578 577
 	}