Skip to content

Commit

Permalink
Merge pull request containers#15532 from edsantiago/docs_dedup_httpproxy
Browse files Browse the repository at this point in the history
[CI:DOCS] Man pages: refactor common options: --http-proxy
  • Loading branch information
openshift-merge-robot authored Aug 30, 2022
2 parents be77c15 + 4e18c81 commit 7f141a7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 33 deletions.
15 changes: 15 additions & 0 deletions docs/source/markdown/options/http-proxy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#### **--http-proxy**

By default proxy environment variables are passed into the container if set
for the Podman process. This can be disabled by setting the value to **false**.
The environment variables passed in include **http_proxy**,
**https_proxy**, **ftp_proxy**, **no_proxy**, and also the upper case versions of
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 through from the host. (Other ways to specify the proxy for the
container include passing the values with the **--env** flag, or hard coding the
proxy environment at container build time.)
(This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

Defaults to **true**.
20 changes: 1 addition & 19 deletions docs/source/markdown/podman-create.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -230,25 +230,7 @@ Print usage statement

@@option hostuser

#### **--http-proxy**

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. 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 through from the host. (Other ways to specify the proxy for the
container include passing the values with the `--env` flag, or hard coding the
proxy environment at container build time.) (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

For example, to disable passing these environment variables from host to
container:

`--http-proxy=false`

Defaults to `true`
@@option http-proxy

@@option image-volume

Expand Down
15 changes: 1 addition & 14 deletions docs/source/markdown/podman-run.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -264,20 +264,7 @@ Print usage statement

@@option hostuser

#### **--http-proxy**

By default proxy environment variables are passed into the container if set
for the Podman process. This can be disabled by setting the value to **false**.
The environment variables passed in include **http_proxy**,
**https_proxy**, **ftp_proxy**, **no_proxy**, and also the upper case versions of
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 through from the host. (Other ways to specify the proxy for the
container include passing the values with the **--env** flag, or hard coding the
proxy environment at container build time.) (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

Defaults to **true**.
@@option http-proxy

@@option image-volume

Expand Down

0 comments on commit 7f141a7

Please sign in to comment.