opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2971 from QiWang19/logoutcheck

Browse Source 
fix logout message if login only with docker
This commit is contained in:
OpenShift Merge Robot
2019-05-03 20:29:41 +02:00
committed by GitHub
parent fde0dc2a55 a6a3269c4e
commit 2658e870d2
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/podman/logout.go
View File

@ -3,6 +3,7 @@ package main
import (
"fmt"
"github.com/containers/image/docker"
"github.com/containers/image/pkg/docker/config"
"github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/libpod/image"
@ -66,12 +67,23 @@ func logoutCmd(c *cliconfig.LogoutValues) error {
}
err := config.RemoveAuthentication(sc, server)
switch err {
switch errors.Cause(err) {
case nil:
fmt.Printf("Removed login credentials for %s\n", server)
return nil
case config.ErrNotLoggedIn:
return errors.Errorf("Not logged into %s\n", server)
// username of user logged in to server (if one exists)
userFromAuthFile, passFromAuthFile, err := config.GetAuthentication(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 {
fmt.Printf("Not logged into %s with podman. Existing credentials were established via docker login. Please use docker logout instead.\n", server)
return nil
}
fmt.Printf("Not logged into %s\n", server)
return nil
default:
return errors.Wrapf(err, "error logging out of %q", server)
}