opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 19:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7028 from xordspar0/patch-1

Browse Source 
docs: Fix formatting mistake
This commit is contained in:
OpenShift Merge Robot
2020-07-21 13:16:05 -04:00
committed by GitHub
parent be5219ab95 111a1fe082
commit 5abf33de32
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/source/markdown/podman-create.1.md
View File

@ -1120,14 +1120,13 @@ 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.
Precedence order (later entries override earlier entries):
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.
- **--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.
Create containers and set the environment ending with a __*__ and a *****

3
docs/source/markdown/podman-run.1.md
View File

@ -1399,9 +1399,10 @@ 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.
- **--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.