summaryrefslogtreecommitdiff
path: root/cmd/podman/login.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-05-20 10:56:00 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-05-20 13:39:40 -0400
commit1d505f6875d27dccafb777853a51045f82888f00 (patch)
tree25c97e90fecfdd106204c051e254df5509ce8676 /cmd/podman/login.go
parent18a953918e1d15aded713f9802865807bd25a1e0 (diff)
downloadpodman-1d505f6875d27dccafb777853a51045f82888f00.tar.gz
podman-1d505f6875d27dccafb777853a51045f82888f00.tar.bz2
podman-1d505f6875d27dccafb777853a51045f82888f00.zip
Update vendor of buildah and containers/images
Mainly add support for podman build using --overlay mounts. Updates containers/image also adds better support for new registries.conf file. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/login.go')
-rw-r--r--cmd/podman/login.go23
1 files changed, 8 insertions, 15 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
index 6bf148cca..9f9631d0d 100644
--- a/cmd/podman/login.go
+++ b/cmd/podman/login.go
@@ -74,21 +74,6 @@ func loginCmd(c *cliconfig.LoginValues) error {
sc.DockerCertPath = c.CertDir
}
- if c.Flag("get-login").Changed {
- user, err := config.GetUserLoggedIn(sc, server)
-
- if err != nil {
- return errors.Wrapf(err, "unable to check for login user")
- }
-
- if user == "" {
- return errors.Errorf("not logged into %s", server)
- }
-
- fmt.Printf("%s\n", user)
- return nil
- }
-
// username of user logged in to server (if one exists)
userFromAuthFile, passFromAuthFile, err := config.GetAuthentication(sc, server)
// Do not return error if no credentials found in credHelpers, new credentials will be stored by config.SetAuthentication
@@ -96,6 +81,14 @@ func loginCmd(c *cliconfig.LoginValues) error {
return errors.Wrapf(err, "error reading auth file")
}
+ if c.Flag("get-login").Changed {
+ if userFromAuthFile == "" {
+ return errors.Errorf("not logged into %s", server)
+ }
+ fmt.Printf("%s\n", userFromAuthFile)
+ return nil
+ }
+
ctx := getContext()
password := c.Password