diff options
| author | Qi Wang <qiwan@redhat.com> | 2018-10-09 09:26:47 -0400 |
|---|---|---|
| committer | Qi Wang <qiwan@redhat.com> | 2018-10-12 10:05:14 -0400 |
| commit | 88673a5fcfcedb3ab3f1039a46b3eba912f35e5c (patch) | |
| tree | 59b86e95fccb21f26591177747adfcffa6816f85 /cmd/podman/login.go | |
| parent | da5c89497f9d6ee5cb6e826d7db7cca5686ab4f7 (diff) | |
| download | podman-88673a5fcfcedb3ab3f1039a46b3eba912f35e5c.tar.gz podman-88673a5fcfcedb3ab3f1039a46b3eba912f35e5c.tar.bz2 podman-88673a5fcfcedb3ab3f1039a46b3eba912f35e5c.zip | |
Support auth file environment variable & add change to man pages
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'cmd/podman/login.go')
| -rw-r--r-- | cmd/podman/login.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 8625828de..76f0f50ff 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -27,7 +27,7 @@ var ( }, cli.StringFlag{ Name: "authfile", - Usage: "Path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json", + Usage: "Path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json. Use REGISTRY_AUTH_FILE environment variable to override. ", }, cli.StringFlag{ Name: "cert-dir", @@ -64,8 +64,9 @@ func loginCmd(c *cli.Context) error { if len(args) == 1 { server = args[0] } + authfile := getAuthFile(c.String("authfile")) - sc := common.GetSystemContext("", c.String("authfile"), false) + sc := common.GetSystemContext("", authfile, false) // username of user logged in to server (if one exists) userFromAuthFile, err := config.GetUserLoggedIn(sc, server) |