зеркало из https://github.com/microsoft/docker.git
remove checkIfLogged
This commit is contained in:
Родитель
6cb908bb82
Коммит
2ba1300773
19
commands.go
19
commands.go
|
@ -858,9 +858,11 @@ func (cli *DockerCli) CmdPush(args ...string) error {
|
|||
|
||||
if err := push(); err != nil {
|
||||
if err.Error() == "Authentication is required." {
|
||||
if err = cli.checkIfLogged("push"); err == nil {
|
||||
return push()
|
||||
fmt.Fprintln(cli.out, "\nPlease login prior to push:")
|
||||
if err := cli.CmdLogin(""); err != nil {
|
||||
return err
|
||||
}
|
||||
return push()
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
@ -1512,19 +1514,6 @@ func (cli *DockerCli) CmdCp(args ...string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (cli *DockerCli) checkIfLogged(action string) error {
|
||||
// If condition AND the login failed
|
||||
if cli.configFile.Configs[auth.IndexServerAddress()].Username == "" {
|
||||
if err := cli.CmdLogin(""); err != nil {
|
||||
return err
|
||||
}
|
||||
if cli.configFile.Configs[auth.IndexServerAddress()].Username == "" {
|
||||
return fmt.Errorf("Please login prior to %s. ('docker login')", action)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cli *DockerCli) call(method, path string, data interface{}) ([]byte, int, error) {
|
||||
var params io.Reader
|
||||
if data != nil {
|
||||
|
|
Загрузка…
Ссылка в новой задаче