diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-30 15:54:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 15:54:36 +0200 |
| commit | cc22b94a7ab13c546e4b0c42024c13fe9d280b39 (patch) | |
| tree | fc1166cfc6d0efb6a3cf493bf563b032d7f39764 /cmd/podman/logout.go | |
| parent | 819375128741f0348b8e4ffd33a96c666e82ee4f (diff) | |
| parent | 366001fb5fa96b3b0f2f9e84b7ebc56dc4c94adc (diff) | |
| download | podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.tar.gz podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.tar.bz2 podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.zip | |
Merge pull request #5602 from rhatdan/vendor
Update vendor of boltdb and containers/image
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 } |