diff --git a/desktop/settings/linux.md b/desktop/settings/linux.md index b13c9bb495..b52708d0de 100644 --- a/desktop/settings/linux.md +++ b/desktop/settings/linux.md @@ -99,23 +99,15 @@ File share settings are: ### Proxies To configure HTTP proxies, switch on the **Manual proxy configuration** setting. +This setting is used for logging 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. -Your proxy settings, however, are not propagated into the containers you start. -If you wish to set the proxy settings for your containers, you need to define -environment variables for them, just like you would do on Linux, for example: - -```console -$ docker run -e HTTP_PROXY=http://proxy.example.com:3128 alpine env - -PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -HOSTNAME=b7edf988b2b5 -TERM=xterm -HOME=/root -HTTP_PROXY=http://proxy.example.com:3128 -``` - -For more information on configuring the Docker CLI to automatically set proxy variables for both `docker run` and `docker build` -see [Configure the Docker client](../../network/proxy.md#configure-the-docker-client). +To prevent developers from accidentally changing the proxy settings, see +[Settings Management](../hardened-desktop/settings-management/index.md#what-features-can-i-configure-with-settings-management). ### Network diff --git a/desktop/settings/mac.md b/desktop/settings/mac.md index 3b2cd18a11..f91cb36bc9 100644 --- a/desktop/settings/mac.md +++ b/desktop/settings/mac.md @@ -134,18 +134,20 @@ HTTP/HTTPS proxies can be used when: - Containers interact with the external network - Scanning images -Each use case above is configured slightly differently. +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 logging 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. -If the host uses a static HTTP/HTTPS proxy configuration, Docker Desktop reads this configuration -and automatically uses these settings for logging into Docker and for pulling and pushing images. +To set a different proxy for Docker Desktop, enable **Manual proxy configuration** and enter a single +upstream proxy URL of the form `http://proxy:port` or `https://proxy:port`. -If the host uses a more sophisticated HTTP/HTTPS configuration, enable **Manual proxy configuration** and enter a single upstream proxy URL -of the form `http://username:password@proxy:port`. - -HTTP/HTTPS traffic from image builds and running containers is forwarded transparently to the same -upstream proxy used for logging in and image pulls. -If you want to override this behaviour and use different HTTP/HTTPS proxies for image builds and -running containers, see [Configure the Docker client](../../network/proxy.md#configure-the-docker-client). +To prevent developers from accidentally changing the proxy settings, see +[Settings Management](../hardened-desktop/settings-management/index.md#what-features-can-i-configure-with-settings-management). The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY` environment variable. diff --git a/desktop/settings/windows.md b/desktop/settings/windows.md index 931103f908..947790727b 100644 --- a/desktop/settings/windows.md +++ b/desktop/settings/windows.md @@ -158,16 +158,20 @@ HTTP/HTTPS proxies can be used when: - Containers interact with the external network - Scanning images -Each use case above is configured slightly differently. +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 logging 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. -If the host uses a static HTTP/HTTPS proxy configuration, Docker Desktop reads this configuration -and automatically uses these settings for logging into Docker and for pulling and pushing images. +To set a different proxy for Docker Desktop, enable **Manual proxy configuration** and enter a single +upstream proxy URL of the form `http://proxy:port` or `https://proxy:port`. -If the host uses a more sophisticated HTTP/HTTPS configuration, enable **Manual proxy configuration** and enter a single upstream proxy URL -of the form `http://username:password@proxy:port`. - -The HTTP/HTTPS proxy settings used for fetching artifacts during builds and for running containers -are set via the `.docker/config.json` file, see [Configure the Docker client](../../network/proxy.md#configure-the-docker-client). +To prevent developers from accidentally changing the proxy settings, see +[Settings Management](../hardened-desktop/settings-management/index.md#what-features-can-i-configure-with-settings-management). The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY` environment variable.