From 111a1fe082ba50c5aa81f3a46a407fb2d6412b91 Mon Sep 17 00:00:00 2001 From: Jordan Christiansen Date: Tue, 21 Jul 2020 10:10:29 -0500 Subject: Document proxy env var precedence Signed-off-by: Jordan Christiansen --- docs/source/markdown/podman-create.1.md | 1 + docs/source/markdown/podman-run.1.md | 1 + 2 files changed, 2 insertions(+) (limited to 'docs/source/markdown') 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. -- cgit v1.2.3-54-g00ecf