diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-11 14:39:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 14:39:50 -0400 |
| commit | 1408dbfa4d7d9cffc7607a768f92a4fcaf3c8651 (patch) | |
| tree | e1d1d1f767bb1fd72ca4d1498ef423df115f6baf | |
| parent | 39ad0387ca27097875b02b55c6f71c2f2b8bdd6c (diff) | |
| parent | b1f8aac05609f29a13e8e469ff22ff2d7f3a29fe (diff) | |
| download | podman-1408dbfa4d7d9cffc7607a768f92a4fcaf3c8651.tar.gz podman-1408dbfa4d7d9cffc7607a768f92a4fcaf3c8651.tar.bz2 podman-1408dbfa4d7d9cffc7607a768f92a4fcaf3c8651.zip | |
Merge pull request #6551 from QiWang19/doc-check-auth
update document login see config.json as valid
| -rw-r--r-- | docs/source/markdown/podman-login.1.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-login.1.md b/docs/source/markdown/podman-login.1.md index a69b311eb..79c7ff640 100644 --- a/docs/source/markdown/podman-login.1.md +++ b/docs/source/markdown/podman-login.1.md @@ -12,7 +12,9 @@ and password. If the registry is not specified, the first registry under [regist from registries.conf will be used. **podman login** reads in the username and password from STDIN. The username and password can also be set using the **username** and **password** flags. The path of the authentication file can be specified by the user by setting the **authfile** -flag. The default path used is **${XDG\_RUNTIME\_DIR}/containers/auth.json**. +flag. The default path used is **${XDG\_RUNTIME\_DIR}/containers/auth.json**. If there is a valid +username and password in the **authfile** , Podman will use those existing credentials if the user does not pass in a username. +If those credentials are not present, Podman will then use any existing credentials found in **$HOME/.docker/config.json**. **podman [GLOBAL OPTIONS]** |