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

Enforce login for push/pull

Browse source
This commit is contained in:
creack 2013-03-22 03:43:57 -07:00
parent e4f9a0dca0
commit e02f7912bc
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
commands.go
View file

@ -405,20 +405,21 @@ func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
if cmd.NArg() == 0 { if cmd.NArg() == 0 || *user == "" {
cmd.Usage() cmd.Usage()
return nil return nil
} }
if srv.runtime.authConfig == nil {
return fmt.Errorf("Please login prior to push. ('docker login')")
}
// Try to get the image // Try to get the image
// FIXME: Handle lookup // FIXME: Handle lookup
// FIXME: Also push the tags in case of ./docker push myrepo:mytag // FIXME: Also push the tags in case of ./docker push myrepo:mytag
// img, err := srv.runtime.LookupImage(cmd.Arg(0)) // img, err := srv.runtime.LookupImage(cmd.Arg(0))
img, err := srv.runtime.graph.Get(cmd.Arg(0)) img, err := srv.runtime.graph.Get(cmd.Arg(0))
if err != nil { if err != nil {
if *user == "" {
return fmt.Errorf("Not logged in and no user specified\n")
}
// 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)) fmt.Fprintf(stdout, "Pushing %s (%d images) on %s...\n", cmd.Arg(0), len(repo), *user+"/"+cmd.Arg(0))
@ -447,11 +448,15 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
if cmd.NArg() == 0 { if cmd.NArg() == 0 || *user == "" {
cmd.Usage() cmd.Usage()
return nil return nil
} }
if srv.runtime.authConfig == nil {
return fmt.Errorf("Please login prior to push. ('docker login')")
}
if srv.runtime.graph.LookupRemoteImage(cmd.Arg(0), srv.runtime.authConfig) { if srv.runtime.graph.LookupRemoteImage(cmd.Arg(0), srv.runtime.authConfig) {
fmt.Fprintf(stdout, "Pulling %s...\n", cmd.Arg(0)) fmt.Fprintf(stdout, "Pulling %s...\n", cmd.Arg(0))
if err := srv.runtime.graph.PullImage(cmd.Arg(0), srv.runtime.authConfig); err != nil { if err := srv.runtime.graph.PullImage(cmd.Arg(0), srv.runtime.authConfig); err != nil {
@ -460,9 +465,6 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
fmt.Fprintf(stdout, "Pulled\n") fmt.Fprintf(stdout, "Pulled\n")
return nil return nil
} }
if *user == "" {
return fmt.Errorf("Not loggin and no user specified\n")
}
// FIXME: Allow pull repo:tag // FIXME: Allow pull repo:tag
fmt.Fprintf(stdout, "Pulling %s from %s...\n", cmd.Arg(0), *user+"/"+cmd.Arg(0)) 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 { if err := srv.runtime.graph.PullRepository(*user, cmd.Arg(0), "", srv.runtime.repositories, srv.runtime.authConfig); err != nil {