mirror of https://github.com/docker/docs.git
Merge pull request #13089 from usha-mandya/engdocs-441
Update proxy server examples to include a diff ip address
This commit is contained in:
commit
c23e4cfd64
|
@ -11,23 +11,21 @@ configure it in different ways:
|
||||||
[configure the Docker client](#configure-the-docker-client) to pass
|
[configure the Docker client](#configure-the-docker-client) to pass
|
||||||
proxy information to containers automatically.
|
proxy information to containers automatically.
|
||||||
|
|
||||||
- In Docker 17.06 and lower, you must
|
- In Docker 17.06 and earlier versions, you must set the appropriate
|
||||||
[set appropriate environment variables](#use-environment-variables)
|
[environment variables](#use-environment-variables)
|
||||||
within the container. You can do this when you build the image (which makes
|
within the container. You can do this when you build the image (which makes
|
||||||
the image less portable) or when you create or run the container.
|
the image less portable) or when you create or run the container.
|
||||||
|
|
||||||
## Configure the Docker client
|
## Configure the Docker client
|
||||||
|
|
||||||
1. On the Docker client, create or edit the file `~/.docker/config.json` in the
|
1. On the Docker client, create or edit the file `~/.docker/config.json` in the
|
||||||
home directory of the user which starts containers. Add JSON such as the
|
home directory of the user that starts containers. Add JSON similar to the
|
||||||
following, substituting the type of proxy with `httpsProxy` or `ftpProxy` if
|
following example. Substitute the type of proxy with `httpsProxy` or `ftpProxy` if necessary, and substitute the address and port of the proxy server. You can also configure multiple proxy servers simultaneously.
|
||||||
necessary, and substituting the address and port of the proxy server. You
|
|
||||||
can configure multiple proxy servers at the same time.
|
|
||||||
|
|
||||||
You can optionally exclude hosts or ranges from going through the proxy
|
You can optionally exclude hosts or ranges from going through the proxy
|
||||||
server by setting a `noProxy` key to one or more comma-separated IP
|
server by setting a `noProxy` key to one or more comma-separated IP
|
||||||
addresses or hosts. Using the `*` character as a wildcard for hosts and using CIDR notation for IP addresses is supported as
|
addresses or hosts. Using the `*` character as a wildcard for hosts and using CIDR notation for IP addresses is supported as
|
||||||
shown in this example.
|
shown in this example:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
|
@ -35,8 +33,8 @@ configure it in different ways:
|
||||||
{
|
{
|
||||||
"default":
|
"default":
|
||||||
{
|
{
|
||||||
"httpProxy": "http://127.0.0.1:3001",
|
"httpProxy": "http://192.168.1.12:3128",
|
||||||
"httpsProxy": "http://127.0.0.1:3001",
|
"httpsProxy": "http://192.168.1.12:3128",
|
||||||
"noProxy": "*.test.example.com,.example2.com,127.0.0.0/8"
|
"noProxy": "*.test.example.com,.example2.com,127.0.0.0/8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -48,7 +46,6 @@ configure it in different ways:
|
||||||
2. When you create or start new containers, the environment variables are
|
2. When you create or start new containers, the environment variables are
|
||||||
set automatically within the container.
|
set automatically within the container.
|
||||||
|
|
||||||
|
|
||||||
## Use environment variables
|
## Use environment variables
|
||||||
|
|
||||||
### Set the environment variables manually
|
### Set the environment variables manually
|
||||||
|
@ -59,10 +56,9 @@ value. This method makes the image less portable, so if you have Docker 17.07
|
||||||
or higher, you should [configure the Docker client](#configure-the-docker-client)
|
or higher, you should [configure the Docker client](#configure-the-docker-client)
|
||||||
instead.
|
instead.
|
||||||
|
|
||||||
| Variable | Dockerfile example | `docker run` Example |
|
| Variable | Dockerfile example | `docker run` example |
|
||||||
|:--------------|:--------------------------------------------------|:----------------------------------------------------|
|
|:--------------|:--------------------------------------------------|:----------------------------------------------------|
|
||||||
| `HTTP_PROXY` | `ENV HTTP_PROXY="http://127.0.0.1:3001"` | `--env HTTP_PROXY="http://127.0.0.1:3001"` |
|
| `HTTP_PROXY` | `ENV HTTP_PROXY="http://192.168.1.12:3128"` | `--env HTTP_PROXY="http://192.168.1.12:3128"` |
|
||||||
| `HTTPS_PROXY` | `ENV HTTPS_PROXY="https://127.0.0.1:3001"` | `--env HTTPS_PROXY="https://127.0.0.1:3001"` |
|
| `HTTPS_PROXY` | `ENV HTTPS_PROXY="https://192.168.1.12:3128"` | `--env HTTPS_PROXY="https://192.168.1.12:3128"` |
|
||||||
| `FTP_PROXY` | `ENV FTP_PROXY="ftp://127.0.0.1:3001"` | `--env FTP_PROXY="ftp://127.0.0.1:3001"` |
|
| `FTP_PROXY` | `ENV FTP_PROXY="ftp://192.168.1.12:3128"` | `--env FTP_PROXY="ftp://192.168.1.12:3128"` |
|
||||||
| `NO_PROXY` | `ENV NO_PROXY="*.test.example.com,.example2.com"` | `--env NO_PROXY="*.test.example.com,.example2.com"` |
|
| `NO_PROXY` | `ENV NO_PROXY="*.test.example.com,.example2.com"` | `--env NO_PROXY="*.test.example.com,.example2.com"` |
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue