summaryrefslogtreecommitdiff
path: root/docs/source/markdown
diff options
context:
space:
mode:
authorQi Wang <qiwan@redhat.com>2020-06-09 21:04:34 -0400
committerQi Wang <qiwan@redhat.com>2020-06-11 13:24:21 -0400
commitb1f8aac05609f29a13e8e469ff22ff2d7f3a29fe (patch)
tree59cc87d8419f8c53fd5072f8aa93ef67cdd5aca6 /docs/source/markdown
parentb2200dbe056ac409461033f646cdd25bcccea521 (diff)
downloadpodman-b1f8aac05609f29a13e8e469ff22ff2d7f3a29fe.tar.gz
podman-b1f8aac05609f29a13e8e469ff22ff2d7f3a29fe.tar.bz2
podman-b1f8aac05609f29a13e8e469ff22ff2d7f3a29fe.zip
update document login see config.json as valid
Update the document, pointing out podman credentials from $HOME/.docker/config.json can be used by Podman. Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'docs/source/markdown')
-rw-r--r--docs/source/markdown/podman-login.1.md4
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]**