Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux 2014-07-18 17:52:24 +00:00
Родитель 4b5b3b4321
Коммит 56a39ca5d3
1 изменённых файлов: 7 добавлений и 11 удалений

Просмотреть файл

@ -369,18 +369,14 @@ func (cli *DockerCli) CmdLogout(args ...string) error {
cli.LoadConfigFile()
if _, ok := cli.configFile.Configs[serverAddress]; !ok {
fmt.Fprintf(cli.out, "Not logged in to %s\n", serverAddress)
os.Exit(0)
} else {
fmt.Fprintf(cli.out, "Remove login credentials for %s\n", serverAddress)
delete(cli.configFile.Configs, serverAddress)
if err := registry.SaveConfig(cli.configFile); err != nil {
return fmt.Errorf("Failed to save docker config: %v", err)
}
}
fmt.Fprintf(cli.out, "Remove login credentials for %s\n", serverAddress)
delete(cli.configFile.Configs, serverAddress)
if err := registry.SaveConfig(cli.configFile); err != nil {
fmt.Fprintln(cli.out, "Failed to save docker config")
os.Exit(1)
}
fmt.Fprintln(cli.out, "Saved docker config")
return nil
}