Skip to content

ENGDOCS-2073 #19860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 6, 2024
Merged

ENGDOCS-2073 #19860

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a051eb2
ENGDOCS-2073
aevesdocker Apr 24, 2024
772ae81
ENGDOCS-2073
aevesdocker Apr 24, 2024
468c44a
review fixes
aevesdocker Apr 25, 2024
a04dbfb
Update content/desktop/settings/windows.md
aevesdocker May 1, 2024
2b59db3
Merge branch 'main' into ENGDOCS-2073
aevesdocker May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions content/desktop/settings/windows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,7 @@ HTTP/HTTPS proxies can be used when:
If the host uses a HTTP/HTTPS proxy configuration (static or via Proxy Auto-Configuration), Docker Desktop reads
this configuration
and automatically uses these settings for signing into Docker, for pulling and pushing images, and for
container Internet access. If the proxy requires authorization then Docker Desktop dynamically asks
the developer for a username and password. All passwords are stored securely in the OS credential store.
Note that only the `Basic` proxy authentication method is supported so we recommend using an `https://`
URL for your HTTP/HTTPS proxies to protect passwords while in transit on the network. Docker Desktop
supports TLS 1.3 when communicating with proxies.
container Internet access.

To set a different proxy for Docker Desktop, turn on **Manual proxy configuration** and enter a single
upstream proxy URL of the form `http://proxy:port` or `https://proxy:port`.
Expand All @@ -216,10 +212,28 @@ The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY
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.
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.


#### Proxy authentication

Docker Desktop supports Basic, Kerberos and NTLM proxy authentication methods.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit

Suggested change
Docker Desktop supports Basic, Kerberos and NTLM proxy authentication methods.
Docker Desktop supports Basic, Kerberos, and NTLM proxy authentication methods.


##### Basic authentication

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.

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.

##### Kerberos and NTLM authentication

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.

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.

> **Note**
>
> Docker Desktop also supports the use of [SOCKS5 proxies](../networking.md#socks5-proxy-support).


### Network

> **Note**
Expand Down