summaryrefslogtreecommitdiff
path: root/docs/source/markdown
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-07-27 15:15:15 -0600
committerEd Santiago <santiago@redhat.com>2020-07-28 09:22:22 -0600
commit409d07a18154b5bfedfc61498a8060fc6e9a3b52 (patch)
treefd2437bea7e2e8fac964cbf42e79dc37fb1fae9e /docs/source/markdown
parent288ebec6e737c105fa0ef43412de4e0a8997feb9 (diff)
downloadpodman-409d07a18154b5bfedfc61498a8060fc6e9a3b52.tar.gz
podman-409d07a18154b5bfedfc61498a8060fc6e9a3b52.tar.bz2
podman-409d07a18154b5bfedfc61498a8060fc6e9a3b52.zip
System tests: add environment, volume tests
Tests for #7094, in which symlinks in a volume would cause chown errors and nonrunnable containers. Tests for environment variable precedence, now include --env-host and proxy settings Fix a bug caught by covscan in helpers.t ('source' path would fail if path included spaces). Fix podman-run man page: it was incorrect in stating precedence between in-image environment and --env-host. Fixes: #7099 Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'docs/source/markdown')
-rw-r--r--docs/source/markdown/podman-run.1.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index b959b947f..4fdb7f81b 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -1411,9 +1411,9 @@ required for VPN, without it containers need to be run with the **--network=host
Environment variables within containers can be set using multiple different options,
in the following order of precedence (later entries override earlier entries):
-- **--env-host**: Host environment of the process executing Podman is added.
-- **--http-proxy**: By default, several environment variables will be passed in from the host, such as **http_proxy** and **no_proxy**. See **--http-proxy** for details.
- Container image: Any environment variables specified in the container image.
+- **--http-proxy**: By default, several environment variables will be passed in from the host, such as **http_proxy** and **no_proxy**. See **--http-proxy** for details.
+- **--env-host**: Host environment of the process executing Podman is added.
- **--env-file**: Any environment variables specified via env-files. If multiple files specified, then they override each other in order of entry.
- **--env**: Any environment variables specified will override previous settings.