浏览代码

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

#146 Auto login on push
Guillaume J. Charmes 12 年之前
父节点
当前提交
52969416bc
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      commands.go

+ 7 - 2
commands.go

@@ -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