From beb2a98bd77b5596e5688f48956f6dc326cfbd8b Mon Sep 17 00:00:00 2001 From: Steve Larkin Date: Thu, 21 Sep 2017 15:43:52 +0200 Subject: [PATCH 1/2] Update documentation of proxy server configuration As per the implementation in docker/cli#93 the proxy server addresses are specified per docker daemon or as defaults. Updated the example to show the default option. Fixes #4686 --- engine/userguide/networking/index.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/userguide/networking/index.md b/engine/userguide/networking/index.md index bcb7f94812d3..aeea442a5b5f 100644 --- a/engine/userguide/networking/index.md +++ b/engine/userguide/networking/index.md @@ -579,7 +579,7 @@ configure it in different ways: 1. On the Docker client, create or edit the file `~/.config.json` in the home directory of the user which starts containers. Add JSON such as the - following, substituting the type of proxy with `httpsproxy` or `ftpproxy` if + following, substituting the type of proxy with `httpsProxy` or `ftpProxy` if necessary, and substituting the address and port of the proxy server. You can configure multiple proxy servers at the same time. @@ -592,8 +592,11 @@ configure it in different ways: { "proxies": { - "httpProxy": "http://127.0.0.1:3001", - "noProxy": "*.test.example.com,.example2.com" + "default": + { + "httpProxy": "http://127.0.0.1:3001", + "noProxy": "*.test.example.com,.example2.com" + } } } ``` From 3afc6aa06027feb98d73253c384c3384e928c590 Mon Sep 17 00:00:00 2001 From: Steve Larkin Date: Fri, 6 Oct 2017 12:42:57 +0200 Subject: [PATCH 2/2] Fix table layout of proxy environment variables --- engine/userguide/networking/index.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/userguide/networking/index.md b/engine/userguide/networking/index.md index aeea442a5b5f..85c61e2ea38b 100644 --- a/engine/userguide/networking/index.md +++ b/engine/userguide/networking/index.md @@ -614,12 +614,12 @@ 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) instead. -| 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"` | -| `HTTPS_PROXY` | `ENV HTTPS_PROXY "https://127.0.0.1:3001"` | `--env HTTPS_PROXY "https://127.0.0.1:3001"` | -| `FTP_PROXY` | `ENV FTP_PROXY "ftp://127.0.0.1:3001"` | `--env FTP_PROXY "ftp://127.0.0.1:3001"` | -| `NO_PROXY` | `ENV NO_PROXY "*.test.example.com,.example2.com" | `--env NO_PROXY "*.test.example.com,.example2.com"` | +| 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"` | +| `HTTPS_PROXY` | `ENV HTTPS_PROXY "https://127.0.0.1:3001"` | `--env HTTPS_PROXY "https://127.0.0.1:3001"` | +| `FTP_PROXY` | `ENV FTP_PROXY "ftp://127.0.0.1:3001"` | `--env FTP_PROXY "ftp://127.0.0.1:3001"` | +| `NO_PROXY` | `ENV NO_PROXY "*.test.example.com,.example2.com"` | `--env NO_PROXY "*.test.example.com,.example2.com"` | ## Links