diff options
| author | Jordan Christiansen <xordspar0@gmail.com> | 2020-07-21 10:10:29 -0500 |
|---|---|---|
| committer | Jordan Christiansen <xordspar0@gmail.com> | 2020-07-21 10:11:05 -0500 |
| commit | 111a1fe082ba50c5aa81f3a46a407fb2d6412b91 (patch) | |
| tree | 3709b0c9a3edea6d991d713eb018d60660fb9f82 | |
| parent | 25105b91dbbcf75d058797503bbac140e362ce0b (diff) | |
| download | podman-111a1fe082ba50c5aa81f3a46a407fb2d6412b91.tar.gz podman-111a1fe082ba50c5aa81f3a46a407fb2d6412b91.tar.bz2 podman-111a1fe082ba50c5aa81f3a46a407fb2d6412b91.zip | |
Document proxy env var precedence
Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
| -rw-r--r-- | docs/source/markdown/podman-create.1.md | 1 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md index 20df9819c..61bcec57a 100644 --- a/docs/source/markdown/podman-create.1.md +++ b/docs/source/markdown/podman-create.1.md @@ -1123,6 +1123,7 @@ Environment variables within containers can be set using multiple different opti Precedence order (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. - **--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. diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md index 656baef02..5c031c204 100644 --- a/docs/source/markdown/podman-run.1.md +++ b/docs/source/markdown/podman-run.1.md @@ -1402,6 +1402,7 @@ Environment variables within containers can be set using multiple different opti 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. - **--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. |