Skip to content

Commit c7447ba

Browse files
committed
desktop: proxy config not supported through daemon.json/config.json
Signed-off-by: David Karlsson <[email protected]>
1 parent dc5bbd5 commit c7447ba

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

content/manuals/desktop/settings.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,12 @@ The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY
258258
> If you are using a PAC file hosted on a web server, make sure to add the MIME type `application/x-ns-proxy-autoconfig` for the `.pac` file extension on the server or website. Without this configuration, the PAC file may not be parsed correctly.
259259
260260
> [!IMPORTANT]
261+
> You cannot configure the proxy settings using the Docker daemon configuration
262+
> file (`daemon.json`), and we recommend you do not configure the proxy
263+
> settings via the Docker CLI configuration file (`config.json`).
261264
>
262-
> You do not need to separately configure proxy settings for the Docker CLI or Docker daemon.
265+
> To manage proxy configurations for Docker Desktop, configure the settings in
266+
> the Docker Desktop app or use [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md).
263267
264268
#### Proxy authentication
265269

@@ -505,4 +509,4 @@ On Mac, you can reconfigure your initial installation settings on the **Advance
505509

506510
- **Enable privileged port mapping (Requires password)**. Starts the privileged helper process which binds the ports that are between 1 and 1024. For more information, see [permission requirements for macOS](/manuals/desktop/install/mac-permission-requirements.md#binding-privileged-ports).
507511

508-
For more information on each configuration and use case, see [Permission requirements](/manuals/desktop/install/mac-permission-requirements.md).
512+
For more information on each configuration and use case, see [Permission requirements](/manuals/desktop/install/mac-permission-requirements.md).

content/manuals/engine/daemon/proxy.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ This page describes how to configure a proxy for the Docker daemon. For
2323
instructions on configuring proxy settings for the Docker CLI, see [Configure
2424
Docker CLI to use a proxy server](/manuals/engine/cli/proxy.md).
2525

26+
> [!IMPORTANT]
27+
> Proxy configurations specified in the `daemon.json` are ignored by Docker
28+
> Desktop. If you use Docker Desktop, you can configure proxies using the
29+
> [Docker Desktop settings](/manuals/desktop/settings.md#proxies).
30+
2631
There are two ways you can configure these settings:
2732

2833
- [Configuring the daemon](#daemon-configuration) through a configuration file or CLI flags

0 commit comments

Comments
 (0)