mirror of
https://github.com/containers/podman.git
synced 2025-07-17 17:43:23 +08:00
Man pages: refactor common options: --tls-verify
Ugh. This had about five different variations among twelve files. I went with the version from podman-create, kube play, login, pull, push, run. The others: - manifest-add and create did not include the "true, false, missing" text. Now they do. (If this text is N/A to these two, please yell). Also, these two were written with "talking" instead of "contacting" the registry. - podman-build had "does not work with remote", but this does not seem to be true, so I removed it. None of the other files had that. - the wording in podman-search is just weird, with "if needed" and "is listed" and unclear "insecure registries". I just nuked it all. If that wording was deliberate, for some reason that applies only to podman-search, please yell. - podman-container-runlabel has one diff that I like, actually spelling out containers-registries.conf(5), but incorporating that would make this even harder to review. I will add that to my in-progress doc-cleanup PR. Review recommendation: run hack/markdown-preprocess-review but just quit out of it immediately (on both popups). Ignore it completely. Then cd /tmp/markdown-preprocess-review.diffs/tls-verify and run $ clear;for i in podman-*;do echo;echo $i;wdiff -t $i zzz-chosen.md;done This will show the major diffs between each version and the chosen one. Assumes you have wdiff installed. If you have another colorize-actual- individual-word-diffs tool installed, use that. I like cdif[1]. [1] https://github.com/kaz-utashiro/sdif-tools Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
1
docs/source/markdown/.gitignore
vendored
1
docs/source/markdown/.gitignore
vendored
@ -11,6 +11,7 @@ podman-login.1.md
|
|||||||
podman-logout.1.md
|
podman-logout.1.md
|
||||||
podman-logs.1.md
|
podman-logs.1.md
|
||||||
podman-manifest-add.1.md
|
podman-manifest-add.1.md
|
||||||
|
podman-manifest-create.1.md
|
||||||
podman-manifest-push.1.md
|
podman-manifest-push.1.md
|
||||||
podman-pause.1.md
|
podman-pause.1.md
|
||||||
podman-pod-clone.1.md
|
podman-pod-clone.1.md
|
||||||
|
5
docs/source/markdown/options/tls-verify.md
Normal file
5
docs/source/markdown/options/tls-verify.md
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#### **--tls-verify**
|
||||||
|
|
||||||
|
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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.
|
@ -627,10 +627,7 @@ timestamp.
|
|||||||
|
|
||||||
If the only instruction in a Containerfile is `FROM`, this flag has no effect.
|
If the only instruction in a Containerfile is `FROM`, this flag has no effect.
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when talking to container registries
|
|
||||||
(defaults to true). (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)
|
|
||||||
|
|
||||||
#### **--ulimit**=*type=soft-limit[:hard-limit]*
|
#### **--ulimit**=*type=soft-limit[:hard-limit]*
|
||||||
|
|
||||||
|
@ -55,9 +55,7 @@ Suppress output information when pulling images
|
|||||||
|
|
||||||
If a container exists of the default or given name, as needed it will be stopped, deleted and a new container will be created from this image.
|
If a container exists of the default or given name, as needed it will be stopped, deleted and a new container will be created from this image.
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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 containers-registries.conf(5).
|
|
||||||
|
|
||||||
## EXAMPLES
|
## EXAMPLES
|
||||||
|
|
||||||
|
@ -442,9 +442,7 @@ When size is `0`, there is no limit on the amount of memory used for IPC by the
|
|||||||
|
|
||||||
@@option timeout
|
@@option timeout
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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.
|
|
||||||
|
|
||||||
@@option tmpfs
|
@@option tmpfs
|
||||||
|
|
||||||
|
@ -219,11 +219,7 @@ Directory path for seccomp profiles (default: "/var/lib/kubelet/seccomp"). (This
|
|||||||
|
|
||||||
Start the pod after creating it, set to false to only create it.
|
Start the pod after creating it, set to false to only create it.
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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.
|
|
||||||
|
|
||||||
@@option userns.container
|
@@option userns.container
|
||||||
## EXAMPLES
|
## EXAMPLES
|
||||||
|
@ -48,11 +48,7 @@ Password for registry
|
|||||||
|
|
||||||
Take the password from stdin
|
Take the password from stdin
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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.
|
|
||||||
|
|
||||||
#### **--username**, **-u**=*username*
|
#### **--username**, **-u**=*username*
|
||||||
|
|
||||||
|
@ -56,9 +56,7 @@ configuration information.
|
|||||||
Specify the OS version which the list or index records as a requirement for the
|
Specify the OS version which the list or index records as a requirement for the
|
||||||
image. This option is rarely used.
|
image. This option is rarely used.
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when talking to container registries (defaults to true).
|
|
||||||
|
|
||||||
#### **--variant**
|
#### **--variant**
|
||||||
|
|
||||||
|
@ -28,9 +28,7 @@ If a manifest list named *listnameorindexname* already exists, modify the
|
|||||||
preexisting list instead of exiting with an error. The contents of
|
preexisting list instead of exiting with an error. The contents of
|
||||||
*listnameorindexname* are not modified if no *imagename*s are given.
|
*listnameorindexname* are not modified if no *imagename*s are given.
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when talking to container registries. (defaults to true)
|
|
||||||
|
|
||||||
## EXAMPLES
|
## EXAMPLES
|
||||||
|
|
@ -59,9 +59,7 @@ Sign the pushed images with a sigstore signature using a private key at the spec
|
|||||||
|
|
||||||
If signing the image (using either **--sign-by** or **--sign-by-sigstore-private-key**), read the passphrase to use from the specified path.
|
If signing the image (using either **--sign-by** or **--sign-by-sigstore-private-key**), read the passphrase to use from the specified path.
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when talking to container registries. (defaults to true)
|
|
||||||
|
|
||||||
## DESTINATION
|
## DESTINATION
|
||||||
|
|
||||||
|
@ -71,11 +71,7 @@ Print the usage statement.
|
|||||||
|
|
||||||
Suppress output information when pulling images
|
Suppress output information when pulling images
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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.
|
|
||||||
|
|
||||||
#### **--variant**=*VARIANT*
|
#### **--variant**=*VARIANT*
|
||||||
|
|
||||||
|
@ -90,11 +90,7 @@ Add a sigstore signature at the destination using a private key at the specified
|
|||||||
|
|
||||||
If signing the image (using either **--sign-by** or **--sign-by-sigstore-private-key**), read the passphrase to use from the specified path.
|
If signing the image (using either **--sign-by** or **--sign-by-sigstore-private-key**), read the passphrase to use from the specified path.
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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.
|
|
||||||
|
|
||||||
## EXAMPLE
|
## EXAMPLE
|
||||||
|
|
||||||
|
@ -481,9 +481,7 @@ Sets whether the signals sent to the **podman run** command are proxied to the c
|
|||||||
|
|
||||||
@@option timeout
|
@@option timeout
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to 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.
|
|
||||||
|
|
||||||
@@option tmpfs
|
@@option tmpfs
|
||||||
|
|
||||||
|
@ -87,12 +87,7 @@ The result contains the Image name and its tag, one line for every tag associate
|
|||||||
|
|
||||||
Do not truncate the output (default *false*).
|
Do not truncate the output (default *false*).
|
||||||
|
|
||||||
#### **--tls-verify**
|
@@option tls-verify
|
||||||
|
|
||||||
Require HTTPS and verify certificates when contacting registries (default: true). If explicitly set to true,
|
|
||||||
then TLS verification will be used. If set to false, then TLS verification will not be used if needed. If not specified,
|
|
||||||
default registries will be searched through (in /etc/containers/registries.conf), and TLS will be skipped if a default
|
|
||||||
registry is listed in the insecure registries.
|
|
||||||
|
|
||||||
## EXAMPLES
|
## EXAMPLES
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user