opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3047 from jamescassell/http-proxy-fixup

Browse Source 
http-proxy: improve docs
This commit is contained in:
OpenShift Merge Robot
2019-05-02 17:47:29 +02:00
committed by GitHub
parent 8a1d7c2fda cf982f1480
commit bd5d029889
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/common.go
View File

@ -315,7 +315,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
)
createFlags.Bool(
"http-proxy", true,
"Set proxy environment variables in container based on the host proxy vars",
"Set proxy environment variables in the container based on the host proxy vars",
)
createFlags.String(
"image-volume", cliconfig.DefaultImageVolume,

12
docs/podman-create.1.md
View File

@ -250,7 +250,17 @@ By default proxy environment variables are passed into the container if set
for the podman process. This can be disabled by setting the `--http-proxy`
option to `false`. The environment variables passed in include `http_proxy`,
`https_proxy`, `ftp_proxy`, `no_proxy`, and also the upper case versions of
those.
those. This option is only needed when the host system must use a proxy but
the container should not use any proxy. Proxy environment variables specified
for the container in any other way will override the values that would have
been passed thru from the host. (Other ways to specify the proxy for the
container include passing the values with the `--env` flag, or hardcoding the
proxy environment at container build time.)
For example, to disable passing these environment variables from host to
container:
`--http-proxy=false`
Defaults to `true`

12
docs/podman-run.1.md
View File

@ -257,7 +257,17 @@ By default proxy environment variables are passed into the container if set
for the podman process. This can be disabled by setting the `--http-proxy`
option to `false`. The environment variables passed in include `http_proxy`,
`https_proxy`, `ftp_proxy`, `no_proxy`, and also the upper case versions of
those.
those. This option is only needed when the host system must use a proxy but
the container should not use any proxy. Proxy environment variables specified
for the container in any other way will override the values that would have
been passed thru from the host. (Other ways to specify the proxy for the
container include passing the values with the `--env` flag, or hardcoding the
proxy environment at container build time.)
For example, to disable passing these environment variables from host to
container:
`--http-proxy=false`
Defaults to `true`