summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorumohnani8 <umohnani@redhat.com>2018-02-06 17:10:10 -0500
committerumohnani8 <umohnani@redhat.com>2018-02-06 17:10:10 -0500
commitfff9a1ee206c626c34117dc454cef5f17f8411a5 (patch)
tree75d0e0f5e80d70e7af8d595a1d906427cc912ce0
parent2df8a32352e5dacecd96ab8e891e3236323215cf (diff)
downloadpodman-fff9a1ee206c626c34117dc454cef5f17f8411a5.tar.gz
podman-fff9a1ee206c626c34117dc454cef5f17f8411a5.tar.bz2
podman-fff9a1ee206c626c34117dc454cef5f17f8411a5.zip
Change default certs dir to /etc/containers/certs.d
Updated man pages to reflect the change Signed-off-by: umohnani8 <umohnani@redhat.com>
-rw-r--r--docs/podman-build.1.md3
-rw-r--r--docs/podman-login.1.md3
-rw-r--r--docs/podman-pull.1.md3
-rw-r--r--docs/podman-push.1.md3
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**