summaryrefslogtreecommitdiff
path: root/docs/podman-run.1.md
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-02 17:47:29 +0200
committerGitHub <noreply@github.com>2019-05-02 17:47:29 +0200
commitbd5d0298893a614db5edcf5dad307597f6b008a9 (patch)
tree7310a87796cb692a951cd51eb978bcb3677e0b60 /docs/podman-run.1.md
parent8a1d7c2fda4a83cc256c7b6d106b0118d8339653 (diff)
parentcf982f148001bdcc05871908eb0763f16077edcf (diff)
downloadpodman-bd5d0298893a614db5edcf5dad307597f6b008a9.tar.gz
podman-bd5d0298893a614db5edcf5dad307597f6b008a9.tar.bz2
podman-bd5d0298893a614db5edcf5dad307597f6b008a9.zip
Merge pull request #3047 from jamescassell/http-proxy-fixup
http-proxy: improve docs
Diffstat (limited to 'docs/podman-run.1.md')
-rw-r--r--docs/podman-run.1.md12
1 files changed, 11 insertions, 1 deletions
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index a0c17652a..5bc32ad52 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -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`