From 16e603147fba793209b79a1ed78e9a3554f1b43a Mon Sep 17 00:00:00 2001 From: Jordan Christiansen Date: Mon, 20 Jul 2020 20:09:58 -0500 Subject: docs: Fix formatting mistake Part of this section was a code block, and part of it was absorbed into the preceding normal paragraph. Signed-off-by: Jordan Christiansen --- docs/source/markdown/podman-create.1.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'docs/source') diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md index dd68f5c39..134d4faab 100644 --- a/docs/source/markdown/podman-create.1.md +++ b/docs/source/markdown/podman-create.1.md @@ -1121,13 +1121,11 @@ required for VPN, without it containers need to be run with the --network=host f Environment variables within containers can be set using multiple different options: This section describes the precedence. Precedence Order: - **--env-host** : Host environment of the process executing Podman is added. - 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. +- **--env-host** : Host environment of the process executing Podman is added. +- 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. Create containers and set the environment ending with a __*__ and a ***** -- cgit v1.2.3-54-g00ecf From 25105b91dbbcf75d058797503bbac140e362ce0b Mon Sep 17 00:00:00 2001 From: Jordan Christiansen Date: Tue, 21 Jul 2020 08:48:40 -0500 Subject: docs: Clarify how env var overriding works Signed-off-by: Jordan Christiansen --- docs/source/markdown/podman-create.1.md | 2 +- docs/source/markdown/podman-run.1.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/source') diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md index 134d4faab..20df9819c 100644 --- a/docs/source/markdown/podman-create.1.md +++ b/docs/source/markdown/podman-create.1.md @@ -1120,7 +1120,7 @@ required for VPN, without it containers need to be run with the --network=host f Environment variables within containers can be set using multiple different options: This section describes the precedence. -Precedence Order: +Precedence order (later entries override earlier entries): - **--env-host** : Host environment of the process executing Podman is added. - Container image : Any environment variables specified in the container image. diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md index c69f41a39..656baef02 100644 --- a/docs/source/markdown/podman-run.1.md +++ b/docs/source/markdown/podman-run.1.md @@ -1399,7 +1399,7 @@ required for VPN, without it containers need to be run with the **--network=host ## ENVIRONMENT Environment variables within containers can be set using multiple different options, -in the following order of precedence: +in the following order of precedence (later entries override earlier entries): - **--env-host**: Host environment of the process executing Podman is added. - Container image: Any environment variables specified in the container image. -- cgit v1.2.3-54-g00ecf 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') 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