diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-29 06:16:27 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-29 06:16:27 -0400 |
| commit | 366001fb5fa96b3b0f2f9e84b7ebc56dc4c94adc (patch) | |
| tree | f0bb3892c5fdf7fc1704dcd28a46b4aa751ff593 /cmd/podman/logout.go | |
| parent | 684b4bd2f16d078edd25d262bb8baefc699508e9 (diff) | |
| download | podman-366001fb5fa96b3b0f2f9e84b7ebc56dc4c94adc.tar.gz podman-366001fb5fa96b3b0f2f9e84b7ebc56dc4c94adc.tar.bz2 podman-366001fb5fa96b3b0f2f9e84b7ebc56dc4c94adc.zip | |
Update vendor of boltdb and containers/image
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/logout.go')
| -rw-r--r-- | cmd/podman/logout.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index dec6822cf..a541438c3 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -87,12 +87,12 @@ func logoutCmd(c *cliconfig.LogoutValues) error { return nil case config.ErrNotLoggedIn: // username of user logged in to server (if one exists) - userFromAuthFile, passFromAuthFile, err := config.GetAuthentication(sc, server) + authConfig, err := config.GetCredentials(sc, server) if err != nil { return errors.Wrapf(err, "error reading auth file") } - islogin := docker.CheckAuth(getContext(), sc, userFromAuthFile, passFromAuthFile, server) - if userFromAuthFile != "" && passFromAuthFile != "" && islogin == nil { + islogin := docker.CheckAuth(getContext(), sc, authConfig.Username, authConfig.Password, server) + if authConfig.IdentityToken != "" && authConfig.Username != "" && authConfig.Password != "" && islogin == nil { fmt.Printf("Not logged into %s with podman. Existing credentials were established via docker login. Please use docker logout instead.\n", server) return nil } |