Merge pull request #147 from dotcloud/146_autologin-feature

#146 Auto login on push
This commit is contained in:
Guillaume J. Charmes 2013-03-24 16:52:50 -07:00
commit 52969416bc

View file

@ -413,8 +413,13 @@ func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string
}
// If the login failed, abort
if srv.runtime.authConfig == nil {
return fmt.Errorf("Please login prior to push. ('docker login')")
if srv.runtime.authConfig == nil || srv.runtime.authConfig.Username == "" {
if err := srv.CmdLogin(stdin, stdout, args...); err != nil {
return err
}
if srv.runtime.authConfig == nil || srv.runtime.authConfig.Username == "" {
return fmt.Errorf("Please login prior to push. ('docker login')")
}
}
var remote string