summaryrefslogtreecommitdiff
path: root/docs/source
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-06-16 05:57:09 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-06-17 14:59:42 -0400
commitb6662eed3f27ac5466501b046db4f1608845af61 (patch)
tree7a4f80a77f812505a6261bc11ed8151235f903f1 /docs/source
parent725b5001a17f703d95a3c88e4f58225c5290576b (diff)
downloadpodman-b6662eed3f27ac5466501b046db4f1608845af61.tar.gz
podman-b6662eed3f27ac5466501b046db4f1608845af61.tar.bz2
podman-b6662eed3f27ac5466501b046db4f1608845af61.zip
Vendor in containers/common v0.40.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/markdown/podman-login.1.md38
1 files changed, 21 insertions, 17 deletions
diff --git a/docs/source/markdown/podman-login.1.md b/docs/source/markdown/podman-login.1.md
index 88d025c70..50c20fcec 100644
--- a/docs/source/markdown/podman-login.1.md
+++ b/docs/source/markdown/podman-login.1.md
@@ -28,18 +28,6 @@ For more details about format and configurations of the auth.json file, please r
## OPTIONS
-#### **--password**, **-p**=*password*
-
-Password for registry
-
-#### **--password-stdin**
-
-Take the password from stdin
-
-#### **--username**, **-u**=*username*
-
-Username for registry
-
#### **--authfile**=*path*
Path of the authentication file. Default is ${XDG\_RUNTIME\_DIR}/containers/auth.json.
@@ -47,14 +35,26 @@ Path of the authentication file. Default is ${XDG\_RUNTIME\_DIR}/containers/auth
Note: You can also override the default path of the authentication file by setting the REGISTRY\_AUTH\_FILE
environment variable. `export REGISTRY_AUTH_FILE=path`
+#### **--cert-dir**=*path*
+
+Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry.
+Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client)
+
#### **--get-login**
Return the logged-in user for the registry. Return error if no login is found.
-#### **--cert-dir**=*path*
+#### **--help**, **-h**
-Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry.
-Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client)
+Print usage statement
+
+#### **--password**, **-p**=*password*
+
+Password for registry
+
+#### **--password-stdin**
+
+Take the password from stdin
#### **--tls-verify**=*true|false*
@@ -62,9 +62,13 @@ Require HTTPS and verify certificates when contacting registries (default: true)
then TLS verification will be used. If set to false, then TLS verification will not be used. If not specified,
TLS verification will be used unless the target registry is listed as an insecure registry in registries.conf.
-#### **--help**, **-h**
+#### **--username**, **-u**=*username*
-Print usage statement
+Username for registry
+
+#### **--verbose**, **-v**
+
+print detailed information about credential store
## EXAMPLES