diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-01 14:51:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 14:51:55 +0200 |
| commit | eea77b5ae3e7fb8a60d438a79d3a4b30d35bb67c (patch) | |
| tree | 37f8f7740e9e615a561422410ff91a0ce13bead0 /docs | |
| parent | 39c937ee450a4de7ab97c013d65157a3b39718b1 (diff) | |
| parent | 354d80626ac4790f261a29a6d53d6cd3fa837bb9 (diff) | |
| download | podman-eea77b5ae3e7fb8a60d438a79d3a4b30d35bb67c.tar.gz podman-eea77b5ae3e7fb8a60d438a79d3a4b30d35bb67c.tar.bz2 podman-eea77b5ae3e7fb8a60d438a79d3a4b30d35bb67c.zip | |
Merge pull request #3018 from jamescassell/auto-http-proxy
Auto http proxy
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-create.1.md | 10 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 52c965293..884a8adcc 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -244,6 +244,16 @@ inside of the container. Read in a line delimited file of environment variables +**--http-proxy**=*true*|*false* + +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. + +Defaults to `true` + **--expose**=[] Expose a port, or a range of ports (e.g. --expose=3300-3310) to set up port redirection diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 4411aca9e..a0c17652a 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -251,6 +251,16 @@ inside of the container. Read in a line delimited file of environment variables +**--http-proxy**=*true*|*false* + +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. + +Defaults to `true` + **--expose**=[] Expose a port, or a range of ports (e.g. --expose=3300-3310) to set up port redirection |