diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-19 15:11:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 15:11:54 +0100 |
| commit | cba5791a5db8980a7952b111b8b846ca15bb6980 (patch) | |
| tree | 2b5357c868dc892a2f85bff7d5adf107454ce4b3 /docs | |
| parent | 1bed53b02c2f65ba26dc320a797c6fe473fce9a1 (diff) | |
| parent | 4c135017b228280e1dd2bd6693fdf2edb44b682a (diff) | |
| download | podman-cba5791a5db8980a7952b111b8b846ca15bb6980.tar.gz podman-cba5791a5db8980a7952b111b8b846ca15bb6980.tar.bz2 podman-cba5791a5db8980a7952b111b8b846ca15bb6980.zip | |
Merge pull request #5233 from QiWang19/login/out-parameter
fix mandatory parameter in login/logout
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman-login.1.md | 7 | ||||
| -rw-r--r-- | docs/source/markdown/podman-logout.1.md | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/source/markdown/podman-login.1.md b/docs/source/markdown/podman-login.1.md index 8a84d359d..a69b311eb 100644 --- a/docs/source/markdown/podman-login.1.md +++ b/docs/source/markdown/podman-login.1.md @@ -4,11 +4,12 @@ podman\-login - Login to a container registry ## SYNOPSIS -**podman login** [*options*] *registry* +**podman login** [*options*] [*registry*] ## DESCRIPTION **podman login** logs into a specified registry server with the correct username -and password. **podman login** reads in the username and password from STDIN. +and password. If the registry is not specified, the first registry under [registries.search] +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**. @@ -17,7 +18,7 @@ flag. The default path used is **${XDG\_RUNTIME\_DIR}/containers/auth.json**. **podman login [GLOBAL OPTIONS]** -**podman login [OPTIONS] REGISTRY [GLOBAL OPTIONS]** +**podman login [OPTIONS] [REGISTRY] [GLOBAL OPTIONS]** ## OPTIONS diff --git a/docs/source/markdown/podman-logout.1.md b/docs/source/markdown/podman-logout.1.md index 01dc52ecd..8b9f75760 100644 --- a/docs/source/markdown/podman-logout.1.md +++ b/docs/source/markdown/podman-logout.1.md @@ -8,7 +8,8 @@ podman\-logout - Logout of a container registry ## DESCRIPTION **podman logout** logs out of a specified registry server by deleting the cached credentials -stored in the **auth.json** file. The path of the authentication file can be overridden by the user by setting the **authfile** flag. +stored in the **auth.json** file. If the registry is not specified, the first registry under [registries.search] +from registries.conf will be used. The path of the authentication file can be overridden by the user by setting the **authfile** flag. The default path used is **${XDG\_RUNTIME\_DIR}/containers/auth.json**. All the cached credentials can be removed by setting the **all** flag. |