diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-02-07 14:06:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 14:06:25 -0500 |
| commit | 6716581545f7936ab585b125e2cfc02d2d802f9f (patch) | |
| tree | 6e1ea333bb38479f13fc17316b01a1072fe8cfce /docs | |
| parent | 3f0170227d40b154205eb9f787e6f0254d75749e (diff) | |
| parent | fff9a1ee206c626c34117dc454cef5f17f8411a5 (diff) | |
| download | podman-6716581545f7936ab585b125e2cfc02d2d802f9f.tar.gz podman-6716581545f7936ab585b125e2cfc02d2d802f9f.tar.bz2 podman-6716581545f7936ab585b125e2cfc02d2d802f9f.zip | |
Merge pull request #303 from umohnani8/certs
Change default certs dir to /etc/containers/certs.d
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-build.1.md | 3 | ||||
| -rw-r--r-- | docs/podman-login.1.md | 3 | ||||
| -rw-r--r-- | docs/podman-pull.1.md | 3 | ||||
| -rw-r--r-- | docs/podman-push.1.md | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md index 61c8d8aaa..d4e9af175 100644 --- a/docs/podman-build.1.md +++ b/docs/podman-build.1.md @@ -38,7 +38,8 @@ resulting image's configuration. **--cert-dir** *path* -Use certificates at *path* (*.crt, *.cert, *.key) to connect to the registry +Use certificates at *path* (*.crt, *.cert, *.key) to connect to the registry. +Default certificates directory is _/etc/containers/certs.d_. **--creds** *creds* diff --git a/docs/podman-login.1.md b/docs/podman-login.1.md index fcf32870a..b22a02553 100644 --- a/docs/podman-login.1.md +++ b/docs/podman-login.1.md @@ -38,7 +38,8 @@ Username for registry Path of the authentication file. Default is ${XDG_\RUNTIME\_DIR}/containers/auth.json **--cert-dir** -Pathname of a directory containing TLS certificates and keys used to connect to the registry +Pathname of a directory containing TLS certificates and keys used to connect to the registry. +Default certificates directory is _/etc/containers/certs.d_. **--tls-verify** Require HTTPS and verify certificates when contacting registries (default: true) diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md index b1212ee6b..cdbe834d3 100644 --- a/docs/podman-pull.1.md +++ b/docs/podman-pull.1.md @@ -61,7 +61,8 @@ If the authorization state is not found there, $HOME/.docker/config.json is chec **--cert-dir** -Pathname of a directory containing TLS certificates and keys +Pathname of a directory containing TLS certificates and keys. +Default certificates directory is _/etc/containers/certs.d_. **--creds** diff --git a/docs/podman-push.1.md b/docs/podman-push.1.md index 63c75ea36..7e1733abf 100644 --- a/docs/podman-push.1.md +++ b/docs/podman-push.1.md @@ -57,7 +57,8 @@ Credentials (USERNAME:PASSWORD) to use for authenticating to a registry **cert-dir="PATHNAME"** -Pathname of a directory containing TLS certificates and keys +Pathname of a directory containing TLS certificates and keys. +Default certificates directory is _/etc/containers/certs.d_. **--compress** |