diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-22 11:05:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 11:05:30 -0400 |
| commit | 11cc72d580e633f7f236cc1c78fb6146d4042c01 (patch) | |
| tree | 70ea399c46cba0cf83e6637b5e690ceab9839448 /docs/source/markdown | |
| parent | 76ace939081baa362292d62375c6d9a2c654c7dc (diff) | |
| parent | a0560eefaa1a5777ac910ec26af7a690a4b1f653 (diff) | |
| download | podman-11cc72d580e633f7f236cc1c78fb6146d4042c01.tar.gz podman-11cc72d580e633f7f236cc1c78fb6146d4042c01.tar.bz2 podman-11cc72d580e633f7f236cc1c78fb6146d4042c01.zip | |
Merge pull request #15407 from edsantiago/docs_dedup_certdir
Man pages: refactor common options: cert-dir
Diffstat (limited to 'docs/source/markdown')
| -rw-r--r-- | docs/source/markdown/options/cert-dir.md | 5 | ||||
| -rw-r--r-- | docs/source/markdown/podman-build.1.md.in | 5 | ||||
| -rw-r--r-- | docs/source/markdown/podman-kube-play.1.md.in | 5 | ||||
| -rw-r--r-- | docs/source/markdown/podman-pull.1.md.in | 5 |
4 files changed, 8 insertions, 12 deletions
diff --git a/docs/source/markdown/options/cert-dir.md b/docs/source/markdown/options/cert-dir.md new file mode 100644 index 000000000..4d05075cf --- /dev/null +++ b/docs/source/markdown/options/cert-dir.md @@ -0,0 +1,5 @@ +#### **--cert-dir**=*path* + +Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d) +Please refer to **[containers-certs.d(5)](https://github.com/containers/image/blob/main/docs/containers-certs.d.5.md)** for details. +(This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines) diff --git a/docs/source/markdown/podman-build.1.md.in b/docs/source/markdown/podman-build.1.md.in index b49beb3bf..c29cf997d 100644 --- a/docs/source/markdown/podman-build.1.md.in +++ b/docs/source/markdown/podman-build.1.md.in @@ -164,10 +164,7 @@ If a capability is specified to both the **--cap-add** and **--cap-drop** options, it will be dropped, regardless of the order in which the options were given. -#### **--cert-dir**=*path* - -Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d) -Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines) +@@option cert-dir @@option cgroup-parent diff --git a/docs/source/markdown/podman-kube-play.1.md.in b/docs/source/markdown/podman-kube-play.1.md.in index 83b9f9904..14c5f2498 100644 --- a/docs/source/markdown/podman-kube-play.1.md.in +++ b/docs/source/markdown/podman-kube-play.1.md.in @@ -118,10 +118,7 @@ and as a result environment variable `FOO` will be set to `bar` for container `c Build images even if they are found in the local storage. Use `--build=false` to completely disable builds. (This option is not available with the remote Podman client) -#### **--cert-dir**=*path* - -Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d) -Please refer to containers-certs.d(5) for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines) +@@option cert-dir #### **--configmap**=*path* diff --git a/docs/source/markdown/podman-pull.1.md.in b/docs/source/markdown/podman-pull.1.md.in index cf06cc6a8..46eaa706a 100644 --- a/docs/source/markdown/podman-pull.1.md.in +++ b/docs/source/markdown/podman-pull.1.md.in @@ -53,10 +53,7 @@ All tagged images in the repository will be pulled. @@option authfile -#### **--cert-dir**=*path* - -Use certificates at *path* (\*.crt, \*.cert, \*.key) to connect to the registry. (Default: /etc/containers/certs.d) -Please refer to **[containers-certs.d(5)](https://github.com/containers/image/blob/main/docs/containers-certs.d.5.md)** for details. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines) +@@option cert-dir #### **--creds**=*[username[:password]]* |