0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8170 from duglin/Issue7547

Browse source 
Allow user to change email/passwd via login - Issue 7547
This commit is contained in:
Tibor Vass 2014-09-23 13:57:56 -04:00
commit e3f1f0d354
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/client/commands.go
View file

@ -273,6 +273,8 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
username = authconfig.Username
}
}
// Assume that a different username means they may not want to use
// the password or email from the config file, so prompt them
if username != authconfig.Username {
if password == "" {
oldState, _ := term.SaveState(cli.terminalFd)
@ -296,8 +298,16 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
}
}
} else {
password = authconfig.Password
email = authconfig.Email
// However, if they don't override the username use the
// password or email from the cmd line if specified. IOW, allow
// then to change/overide them. And if not specified, just
// use what's in the config file
if password == "" {
password = authconfig.Password
}
if email == "" {
email = authconfig.Email
}
}
authconfig.Username = username
authconfig.Password = password