Skip to content

Commit 51cbd19

Browse files
aevesdockerelegantcoder
authored andcommitted
ENGDOCS-2073 (docker#19860)
* ENGDOCS-2073 * ENGDOCS-2073 * review fixes * Update content/desktop/settings/windows.md
1 parent 85cb8c0 commit 51cbd19

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

content/desktop/settings/windows.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,7 @@ HTTP/HTTPS proxies can be used when:
199199
If the host uses a HTTP/HTTPS proxy configuration (static or via Proxy Auto-Configuration), Docker Desktop reads
200200
this configuration
201201
and automatically uses these settings for signing into Docker, for pulling and pushing images, and for
202-
container Internet access. If the proxy requires authorization then Docker Desktop dynamically asks
203-
the developer for a username and password. All passwords are stored securely in the OS credential store.
204-
Note that only the `Basic` proxy authentication method is supported so we recommend using an `https://`
205-
URL for your HTTP/HTTPS proxies to protect passwords while in transit on the network. Docker Desktop
206-
supports TLS 1.3 when communicating with proxies.
202+
container Internet access.
207203

208204
To set a different proxy for Docker Desktop, turn on **Manual proxy configuration** and enter a single
209205
upstream proxy URL of the form `http://proxy:port` or `https://proxy:port`.
@@ -216,10 +212,28 @@ The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY
216212
If you are running Windows containers in Docker, you can allow the Windows Docker daemon to use Docker Desktop's internal proxy, with the **Use proxy for Windows Docker daemon** setting.
217213
This is useful when a corporate proxy that requires authentication is manually configured or set at the system level. If you are an admin for your organization and have a Docker Business subscription, you can control this setting with [Settings management](../hardened-desktop/settings-management/configure.md) using the `windowsDockerdPort` parameter.
218214

215+
216+
#### Proxy authentication
217+
218+
Docker Desktop supports Basic, Kerberos and NTLM proxy authentication methods.
219+
220+
##### Basic authentication
221+
222+
If your proxy uses Basic authentication, Docker Desktop prompts developers for a username and password and caches the credentials. All passwords are stored securely in the OS credential store. It will request re-authentication if that cache is removed.
223+
224+
It's recommended that you use an `https://` URL for HTTP/HTTPS proxies to protect passwords during network transit. Docker Desktop also supports TLS 1.3 for communication with proxies.
225+
226+
##### Kerberos and NTLM authentication
227+
228+
Kerberos and NTLM proxy authentication are available for Business subscribers with Docker Desktop version 4.30 and later. No additional configuration is needed beyond specifying the proxy IP address and port.
229+
230+
Developers are no longer interrupted by prompts for proxy credentials as authentication is centralized. This also reduces the risk of account lockouts due to incorrect sign in attempts.
231+
219232
> **Note**
220233
>
221234
> Docker Desktop also supports the use of [SOCKS5 proxies](../networking.md#socks5-proxy-support).
222235
236+
223237
### Network
224238

225239
> **Note**

0 commit comments

Comments
 (0)