summaryrefslogtreecommitdiff
path: root/docs/source/markdown/podman.1.md
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-07-24 12:04:18 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-07-25 05:41:31 -0400
commit7d0a5fc0da39ffd23770edb1eed81c2665c26c0d (patch)
treee93e04ba0d6ebb8b9020504190a44f8bb16a473c /docs/source/markdown/podman.1.md
parentc2deeff10101a5d9da70ecf496f8bdfc4ec99fb4 (diff)
downloadpodman-7d0a5fc0da39ffd23770edb1eed81c2665c26c0d.tar.gz
podman-7d0a5fc0da39ffd23770edb1eed81c2665c26c0d.tar.bz2
podman-7d0a5fc0da39ffd23770edb1eed81c2665c26c0d.zip
update configuration for rootless podman
I updated the configuration part of the tutorial on rootless podman. I added the order in which configuration files are read in and a hint, how users can create default configuration in the home directories. Closes #6777 Signed-off-by: Niklas Netter <niknett@gmail.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs/source/markdown/podman.1.md')
-rw-r--r--docs/source/markdown/podman.1.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index 776ee7a67..74f02d147 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