diff options
author | Urvashi Mohnani <umohnani@redhat.com> | 2017-11-21 10:39:38 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-11-21 18:08:59 +0000 |
commit | 7b736e333315e6f533b9677712a0c2e037cc293b (patch) | |
tree | 9422a7d368d30c9aa4b3e0ae030154054a03d3d4 | |
parent | c75c319ea2b818cad25061ba6b77b55db28ab869 (diff) | |
download | podman-7b736e333315e6f533b9677712a0c2e037cc293b.tar.gz podman-7b736e333315e6f533b9677712a0c2e037cc293b.tar.bz2 podman-7b736e333315e6f533b9677712a0c2e037cc293b.zip |
Mention docker login for creds authentication in documentation
Since we fall back to checking $HOME/.docker/config.json, which is set by docker login,
if the creds are not found in $XDG_RUNTIME_DIR/containers/auth.json, which is set by kpod login
Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
Closes: #55
Approved by: rhatdan
-rw-r--r-- | docs/kpod-pull.1.md | 7 | ||||
-rw-r--r-- | docs/kpod-push.1.md | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/docs/kpod-pull.1.md b/docs/kpod-pull.1.md index 254fc5846..f9933b6c6 100644 --- a/docs/kpod-pull.1.md +++ b/docs/kpod-pull.1.md @@ -32,7 +32,7 @@ Image stored in local container/storage An existing local directory _path_ storing the manifest, layer tarballs and signatures as individual files. This is a non-standardized format, primarily useful for debugging or noninvasive container inspection. **docker://**_docker-reference_ - An image in a registry implementing the "Docker Registry HTTP API V2". By default, uses the authorization state in `$XDG_RUNTIME_DIR/containers/auth.json`, which is set e.g. using `(kpod login)`. + An image in a registry implementing the "Docker Registry HTTP API V2". By default, uses the authorization state in `$XDG_RUNTIME_DIR/containers/auth.json`, which is set using `(kpod login)`. If the authorization state is not found there, `$HOME/.docker/config.json` is checked, which is set using `(docker login)`. **docker-archive:**_path_[**:**_docker-reference_] An image is stored in the `docker save` formatted file. _docker-reference_ is only used when creating such a file, and it must not contain a digest. @@ -56,7 +56,8 @@ Image stored in local container/storage **--authfile** -Path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json +Path of the authentication file. Default is ${XDG_RUNTIME\_DIR}/containers/auth.json, which is set using `kpod login`. +If the authorization state is not found there, $HOME/.docker/config.json is checked, which is set using `docker login`. **--cert-dir** @@ -129,7 +130,7 @@ Storing signatures ``` ## SEE ALSO -kpod(1), kpod-push(1), crio(8), crio.conf(5) +kpod(1), kpod-push(1), crio(8), crio.conf(5), docker-login(1) ## HISTORY July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/kpod-push.1.md b/docs/kpod-push.1.md index 801615034..a9d314cbe 100644 --- a/docs/kpod-push.1.md +++ b/docs/kpod-push.1.md @@ -26,7 +26,7 @@ Image stored in local container/storage An existing local directory _path_ storing the manifest, layer tarballs and signatures as individual files. This is a non-standardized format, primarily useful for debugging or noninvasive container inspection. **docker://**_docker-reference_ - An image in a registry implementing the "Docker Registry HTTP API V2". By default, uses the authorization state in `$XDG_RUNTIME_DIR/containers/auth.json`, which is set e.g. using `(kpod login)`. + An image in a registry implementing the "Docker Registry HTTP API V2". By default, uses the authorization state in `$XDG_RUNTIME_DIR/containers/auth.json`, which is set using `(kpod login)`. If the authorization state is not found there, `$HOME/.docker/config.json` is checked, which is set using `(docker login)`. **docker-archive:**_path_[**:**_docker-reference_] An image is stored in the `docker save` formatted file. _docker-reference_ is only used when creating such a file, and it must not contain a digest. @@ -44,7 +44,8 @@ Image stored in local container/storage **--authfile** -Path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json +Path of the authentication file. Default is ${XDG_RUNTIME\_DIR}/containers/auth.json, which is set using `kpod login`. +If the authorization state is not found there, $HOME/.docker/config.json is checked, which is set using `docker login`. **--creds="CREDENTIALS"** @@ -113,4 +114,4 @@ Storing signatures ``` ## SEE ALSO -kpod(1), kpod-pull(1), crio(8), crio.conf(5) +kpod(1), kpod-pull(1), crio(8), crio.conf(5), docker-login(1) |