Skip to content

Commit 1663d59

Browse files
authored
freshness: enforce sign-in (#24675)
<!--Delete sections as needed --> ## Description <!-- Tell us what you did and why --> ## Related issues or tickets <!-- Related issues, pull requests, or Jira tickets --> ## Reviews <!-- Notes for reviewers here --> <!-- List applicable reviews (optionally @tag reviewers) --> - [ ] Technical review - [ ] Editorial review - [ ] Product review
1 parent 05e75ee commit 1663d59

2 files changed

Lines changed: 12 additions & 27 deletions

File tree

content/manuals/enterprise/security/enforce-sign-in/methods.md

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ You can enforce sign-in for Docker Desktop using several methods. Choose the met
1717
| Method | Platform |
1818
|:-------|:---------|
1919
| Registry key | Windows only |
20-
| Configuration profiles | macOS only |
21-
| `plist` file | macOS only |
20+
| Configuration profiles | Mac only |
21+
| `plist` file | Mac only |
2222
| `registry.json` | All platforms |
2323

2424
> [!TIP]
2525
>
26-
> For macOS, configuration profiles offer the highest security because they're
26+
> For Mac, configuration profiles offer the highest security because they're
2727
protected by Apple's System Integrity Protection (SIP).
2828

2929
## Windows: Registry key method
@@ -39,19 +39,13 @@ To configure the registry key method manually:
3939
$ HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Docker\Docker Desktop
4040
```
4141
1. Create a multi-string value name `allowedOrgs`.
42-
1. Use your organization names as string data:
42+
1. Use your organization names as string data. You can add multiple organizations:
4343
- Use lowercase letters only
4444
- Add each organization on a separate line
4545
- Do not use spaces or commas as separators
4646
1. Restart Docker Desktop.
4747
1. Verify the `Sign in required!` prompt appears in Docker Desktop.
4848

49-
> [!IMPORTANT]
50-
>
51-
> You can add multiple organizations with Docker Desktop version 4.36 and later.
52-
With version 4.35 and earlier, adding multiple organizations causes sign-in
53-
enforcement to fail silently.
54-
5549
{{< /tab >}}
5650
{{< tab name="Group Policy deployment" >}}
5751

@@ -73,25 +67,20 @@ Deploy the registry key across your organization using Group Policy:
7367
{{< /tab >}}
7468
{{< /tabs >}}
7569

76-
## macOS: Configuration profiles method (recommended)
77-
78-
{{< summary-bar feature_name="Config profiles" >}}
70+
## Mac: Configuration profiles method (recommended)
7971

80-
Configuration profiles provide the most secure enforcement method for macOS, as they're protected by Apple's System Integrity Protection.
72+
Configuration profiles provide the most secure enforcement method for Mac, as they're protected by Apple's System Integrity Protection.
8173

8274
The payload is a dictionary of key-values. Docker Desktop supports the following keys:
8375

8476
- `allowedOrgs`: Sets a list of organizations in one single string, where each organization is separated by a semi-colon.
85-
86-
In Docker Desktop version 4.48 and later, the following keys are also supported:
87-
8877
- `overrideProxyHTTP`: Sets the URL of the HTTP proxy that must be used for outgoing HTTP requests.
8978
- `overrideProxyHTTPS`: Sets the URL of the HTTP proxy that must be used for outgoing HTTPS requests.
9079
- `overrideProxyExclude`: Bypasses proxy settings for the specified hosts and domains. Uses a comma-separated list.
9180
- `overrideProxyPAC`: Sets the file path where the PAC file is located. It has precedence over the remote PAC file on the selected proxy.
9281
- `overrideProxyEmbeddedPAC`: Sets the content of an in-memory PAC file. It has precedence over `overrideProxyPAC`.
9382

94-
Overriding at least one of the proxy settings via Configuration profiles will automatically lock the settings as they're managed by macOS.
83+
Overriding at least one of the proxy settings via Configuration profiles will automatically lock the settings as they're managed by Mac.
9584

9685

9786
1. Create a file named `docker.mobileconfig` and include the following content:
@@ -164,9 +153,7 @@ Some MDM solutions let you specify the payload as a plain dictionary of key-valu
164153
</dict>
165154
```
166155

167-
## macOS: plist file method
168-
169-
Use this alternative method for macOS with Docker Desktop version 4.32 and later.
156+
## Mac: plist file method
170157

171158
{{< tabs >}}
172159
{{< tab name="Manual creation" >}}
@@ -259,7 +246,7 @@ Create the `registry.json` file (UTF-8 without BOM) at the appropriate location:
259246
Set-Content /ProgramData/DockerDesktop/registry.json '{"allowedOrgs":["myorg1","myorg2"]}'
260247
```
261248

262-
#### macOS
249+
#### Mac
263250

264251
```console
265252
sudo mkdir -p "/Library/Application Support/com.docker.docker"
@@ -288,7 +275,7 @@ Start-Process '.\Docker Desktop Installer.exe' -Wait 'install --allowed-org=myor
288275
"Docker Desktop Installer.exe" install --allowed-org=myorg
289276
```
290277

291-
#### macOS
278+
#### Mac
292279

293280
```console
294281
sudo hdiutil attach Docker.dmg
@@ -304,8 +291,8 @@ sudo hdiutil detach /Volumes/Docker
304291
When multiple configuration methods exist on the same system, Docker Desktop uses this precedence order:
305292

306293
1. Registry key (Windows only)
307-
1. Configuration profiles (macOS only)
308-
1. plist file (macOS only)
294+
1. Configuration profiles (Mac only)
295+
1. plist file (Mac only)
309296
1. registry.json file
310297

311298
## Troubleshoot sign-in enforcement

data/summary.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ Compose attach:
8383
requires: Docker Compose [2.20.0](https://github.com/docker/compose/releases/tag/v2.20.0) and later
8484
Compose bridge:
8585
requires: Docker Desktop 4.43.0 and later
86-
Config profiles:
87-
requires: Docker Desktop 4.36 and later
8886
Compose dependent images:
8987
requires: Docker Compose [2.22.0](https://github.com/docker/compose/releases/tag/v2.22.0) and later
9088
Compose cgroup:

0 commit comments

Comments
 (0)