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 branch 'graph' of ssh://github.com/dotcloud/docker into graph

Browse source
This commit is contained in:
Solomon Hykes 2013-03-22 17:52:27 -07:00
commit 520af226c0
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
commands.go
View file

@ -419,15 +419,24 @@ func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string
} }
// If it fails, try to get the repository // If it fails, try to get the repository
if repo, exists := srv.runtime.repositories.Repositories[cmd.Arg(0)]; exists { if repo, exists := srv.runtime.repositories.Repositories[cmd.Arg(0)]; exists {
fmt.Fprintf(stdout, "Pushing %s (%d images) on %s...\n", cmd.Arg(0), len(repo), *user+"/"+cmd.Arg(0))
if err := srv.runtime.graph.PushRepository(*user, cmd.Arg(0), repo, srv.runtime.authConfig); err != nil { if err := srv.runtime.graph.PushRepository(*user, cmd.Arg(0), repo, srv.runtime.authConfig); err != nil {
return err return err
} }
fmt.Fprintf(stdout, "Push completed\n")
return nil
} else { } else {
return err return err
} }
return nil return nil
} }
return srv.runtime.graph.PushImage(img, srv.runtime.authConfig) fmt.Fprintf(stdout, "Pushing image %s..\n", img.Id)
err = srv.runtime.graph.PushImage(img, srv.runtime.authConfig)
if err != nil {
return err
}
fmt.Fprintf(stdout, "Push completed\n")
return nil
} }
func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
@ -442,13 +451,23 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
} }
if srv.runtime.graph.LookupRemoteImage(cmd.Arg(0), srv.runtime.authConfig) { if srv.runtime.graph.LookupRemoteImage(cmd.Arg(0), srv.runtime.authConfig) {
return srv.runtime.graph.PullImage(cmd.Arg(0), srv.runtime.authConfig) fmt.Fprintf(stdout, "Pulling %s...\n", cmd.Arg(0))
if err := srv.runtime.graph.PullImage(cmd.Arg(0), srv.runtime.authConfig); err != nil {
return err
}
fmt.Fprintf(stdout, "Pulled\n")
return nil
} }
if *user == "" { if *user == "" {
return fmt.Errorf("Not loggin and no user specified\n") return fmt.Errorf("Not loggin and no user specified\n")
} }
// FIXME: Allow pull repo:tag // FIXME: Allow pull repo:tag
return srv.runtime.graph.PullRepository(*user, cmd.Arg(0), "", srv.runtime.repositories, srv.runtime.authConfig) fmt.Fprintf(stdout, "Pulling %s from %s...\n", cmd.Arg(0), *user+"/"+cmd.Arg(0))
if err := srv.runtime.graph.PullRepository(*user, cmd.Arg(0), "", srv.runtime.repositories, srv.runtime.authConfig); err != nil {
return err
}
fmt.Fprintf(stdout, "Pull completed\n")
return nil
} }
func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...string) error {