diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-28 17:52:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 17:52:08 -0400 |
| commit | b0777adcacef2f568ea68af81e6889d4cbdc3e0f (patch) | |
| tree | fd2437bea7e2e8fac964cbf42e79dc37fb1fae9e /docs | |
| parent | 288ebec6e737c105fa0ef43412de4e0a8997feb9 (diff) | |
| parent | 409d07a18154b5bfedfc61498a8060fc6e9a3b52 (diff) | |
| download | podman-b0777adcacef2f568ea68af81e6889d4cbdc3e0f.tar.gz podman-b0777adcacef2f568ea68af81e6889d4cbdc3e0f.tar.bz2 podman-b0777adcacef2f568ea68af81e6889d4cbdc3e0f.zip | |
Merge pull request #7110 from edsantiago/bats
System tests: add environment, volume tests
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman-run.1.md | 4 |
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. |