diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-28 14:58:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 14:58:52 +0200 |
| commit | 14f8085016bd7f3f5060e9c682abd5ecb2836fbe (patch) | |
| tree | 9af95476c059ead2734a9a52419acc9822334389 /docs/source | |
| parent | ecd84781d8b8d28b5f3920aa906a87ec48345f7d (diff) | |
| parent | 7d0a5fc0da39ffd23770edb1eed81c2665c26c0d (diff) | |
| download | podman-14f8085016bd7f3f5060e9c682abd5ecb2836fbe.tar.gz podman-14f8085016bd7f3f5060e9c682abd5ecb2836fbe.tar.bz2 podman-14f8085016bd7f3f5060e9c682abd5ecb2836fbe.zip | |
Merge pull request #7079 from rhatdan/tuturial
update configuration for rootless podman
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/markdown/podman.1.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index e0d66b6d4..e1f176869 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -217,7 +217,7 @@ the exit codes follow the `chroot` standard, see below: ## FILES -**containers.conf** (`/usr/share/containers/containers.conf`) +**containers.conf** (`/usr/share/containers/containers.conf`, `/etc/containers/containers.conf`, `$HOME/.config/containers/containers.conf`) Podman has builtin defaults for command line options. These defaults can be overridden using the containers.conf configuration files. @@ -235,13 +235,13 @@ When Podman runs in rootless mode, the file `$HOME/.config/containers/mounts.con Signature verification policy files are used to specify policy, e.g. trusted keys, applicable when deciding whether to accept an image, or individual signatures of that image, as valid. -**registries.conf** (`/etc/containers/registries.conf`) +**registries.conf** (`/etc/containers/registries.conf`, `$HOME/.config/containers/registries.conf`) registries.conf is the configuration file which specifies which container registries should be consulted when completing image names which do not include a registry or domain portion. Non root users of Podman can create the `$HOME/.config/containers/registries.conf` file to be used instead of the system defaults. -**storage.conf** (`/etc/containers/storage.conf`) +**storage.conf** (`/etc/containers/storage.conf`, `$HOME/.config/contaners/storage.conf`) storage.conf is the storage configuration file for all tools using containers/storage |