Skip to content

Commit c1963cc

Browse files
Clarify proxy configuration setting for Docker Desktop (#25303)
Added note about proxy configuration requirements for Docker Desktop. <!--Delete sections as needed --> ## Description <!-- Tell us what you did and why --> Proxy configuration is a special case that needs configuration in Admin Console as well as in admin-settings.json/install-settings.json. Most customers miss the proxy configuration in admin-settings/install-settings.json resulting in sign-in issues with DD. Hopefully this will reduce the cases or at least we can point them to this updated manual. ## Related issues or tickets https://docker.atlassian.net/browse/SEG-1703 <!-- Related issues, pull requests, or Jira tickets --> ## Reviews <!-- Notes for reviewers here --> <!-- List applicable reviews (optionally @tag reviewers) --> - [ ] Technical review - [ ] Editorial review - [ ] Product review --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com>
1 parent 817bd2b commit c1963cc

2 files changed

Lines changed: 22 additions & 0 deletions

File tree

content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,17 @@ The following tables describe all available settings in the `admin-settings.json
317317
| `pac` | | Specifies a PAC file URL. For example, `"pac": "http://proxy/proxy.pac"`. | |
318318
| `embeddedPac` | | Specifies an embedded PAC (Proxy Auto-config) script. For example, `"embeddedPac": "function FindProxyForURL(url, host) { return \"DIRECT\"; }"`. This setting takes precedence over HTTP, HTTPS, Proxy bypass and PAC server URL. | |
319319

320+
> [!NOTE]
321+
>
322+
> Proxy configuration is a special case because it must be configured in two places:
323+
>
324+
> 1. In the Admin Console for your organization.
325+
> 2. On the user's system where Docker Desktop is installed.
326+
>
327+
> On the user's machine, configure the proxy either through the `admin-settings.json` file or by using installer flags during Docker Desktop installation. For detailed instructions, refer to the [installation guide](/manuals/desktop/setup/install/windows-install.md#proxy-configuration).
328+
>
329+
> This additional configuration is required because Docker Desktop must know which proxy server to use before it can complete user sign-in and retrieve organization settings from the Admin Console.
330+
320331
### Container proxy
321332

322333
| Parameter | OS | Description | Version |

content/manuals/enterprise/security/hardened-desktop/settings-management/settings-reference.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,17 @@ Keeps image metadata current by indexing during idle time or after image operati
324324

325325
## Proxy
326326

327+
> [!NOTE]
328+
>
329+
> Proxy configuration is a special case because it must be configured in two places:
330+
>
331+
> 1. In the Admin Console for your organization.
332+
> 2. On the user's system where Docker Desktop is installed.
333+
>
334+
> On the user's machine, configure the proxy either through the `admin-settings.json` file or by using installer flags during Docker Desktop installation. For detailed instructions, refer to the [installation guide](/manuals/desktop/setup/install/windows-install.md#proxy-configuration).
335+
>
336+
> This additional configuration is required because Docker Desktop must know which proxy server to use before it can complete user sign-in and retrieve organization settings from the Admin Console.
337+
327338
### Embedded PAC script
328339

329340
Specifies an embedded Proxy Auto-Config (PAC) script. For example: `"embeddedPac": "function FindProxyForURL(url, host) { return \"DIRECT\"; }"`.

0 commit comments

Comments
 (0)