summaryrefslogtreecommitdiff
path: root/docs/source/markdown/podman-run.1.md
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-20 13:15:49 +0100
committerGitHub <noreply@github.com>2020-11-20 13:15:49 +0100
commit042d4884ea35467df5da053627e5535e82fb2d27 (patch)
treedebfc4e7d5cf6680cef751ef5d0cc00ad1939b1e /docs/source/markdown/podman-run.1.md
parent577015d4d20608d43e70cc537011d8a1017431a2 (diff)
parent977094781841f57c82b71e3ccc32dad952a8c0e5 (diff)
downloadpodman-042d4884ea35467df5da053627e5535e82fb2d27.tar.gz
podman-042d4884ea35467df5da053627e5535e82fb2d27.tar.bz2
podman-042d4884ea35467df5da053627e5535e82fb2d27.zip
Merge pull request #8285 from rhatdan/containers.conf
Document containers.conf settings for remote connections
Diffstat (limited to 'docs/source/markdown/podman-run.1.md')
-rw-r--r--docs/source/markdown/podman-run.1.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index 5b2cdd6a5..bc3d5a8bb 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -33,6 +33,10 @@ is located at _/run/.containerenv_.
When running from a user defined network namespace, the _/etc/netns/NSNAME/resolv.conf_
will be used if it exists, otherwise _/etc/resolv.conf_ will be used.
+Default settings are defined in `containers.conf`. Most settings for remote
+connections use the servers containers.conf, except when documented in man
+pages.
+
## OPTIONS
#### **--add-host**=_host_:_ip_
@@ -857,6 +861,7 @@ Signal to stop a container. Default is **SIGTERM**.
#### **--stop-timeout**=*seconds*
Timeout to stop a container. Default is **10**.
+Remote connections use local containers.conf for defaults
#### **--subgidname**=*name*
@@ -952,10 +957,12 @@ standard input.
#### **--tz**=*timezone*
Set timezone in container. This flag takes area-based timezones, GMT time, as well as `local`, which sets the timezone in the container to match the host machine. See `/usr/share/zoneinfo/` for valid timezones.
+Remote connections use local containers.conf for defaults
#### **--umask**=*umask*
Set the umask inside the container. Defaults to `0022`.
+Remote connections use local containers.conf for defaults
#### **--uidmap**=*container_uid*:*host_uid*:*amount*