Skip to content

Commit c79d205

Browse files
typos
1 parent b69af30 commit c79d205

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

content/manuals/security/for-admins/hardened-desktop/settings-management/_index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ by developers and ensure that these cannot be modified.
4343
## What features can I configure with Settings Management?
4444

4545
You can configure a wide range of features, from proxies and Kubernetes settings
46-
to Enhanced Container isolation. For more information, view the [full list of
47-
configurable settings]().
46+
to Enhanced Container isolation. For more information, view the [Settings reference](/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md).
47+
48+
The settings reference outlines what settings can be configured with the [Admin
49+
Console](/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md) or [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md).
4850

4951
## How do I set up and enforce Settings Management?
5052

content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ This page contains information for administrators on how to configure Settings M
1818
subscription, therefore your Docker Desktop users must authenticate to your
1919
organization for configurations to take effect.
2020

21+
> [!IMPORTANT]
22+
>
23+
> For settings to take effect, users must be added to your verified domain.
24+
2125
## Create a settings policy
2226

2327
1. Within the [Docker Admin Console](https://app.docker.com/admin) navigate to the company or organization you want to define a settings policy for.

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ Settings Management is designed specifically for organizations who don’t give
1717

1818
## Prerequisites
1919

20-
You must [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) to ensure that all Docker Desktop users authenticate with your organization.
21-
22-
Settings management requires a Docker Business subscription. Docker Desktop verifies the user's authentication and licensing before applying any settings from the `admin-settings.json` file. The settings file will not take effect unless both authentication and license checks pass. These checks ensure that only licensed users receive managed settings.
20+
- You must [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) to ensure that all Docker Desktop users authenticate with your organization.
21+
- Settings management requires a Docker Business subscription. Docker Desktop verifies the user's authentication and licensing before applying any settings from the `admin-settings.json` file. The settings file will not take effect unless both authentication and license checks pass. These checks ensure that only licensed users receive managed settings.
2322

2423
> [!IMPORTANT]
2524
>
2625
> If a user is not signed in, or their Docker ID does not belong to an organization with a Docker Business subscription, Docker Desktop ignores the `admin-settings.json` file.
2726
28-
2927
## Known limitations
3028

3129
The `admin-settings.json` file requires users to authenticate with Docker Hub and be a member
@@ -34,8 +32,7 @@ of an organization with a Docker Business subscription. This means the file does
3432
- Air-grapped or offline environments where Docker Desktop can't authenticate with Docker Hub.
3533
- Restricted environments where SSO and cloud-based authentication are not permitted.
3634

37-
38-
## Step one: Create the `admin-settings.json` file and save it in the correct location
35+
## Step one: Create the `admin-settings.json` file and save it
3936

4037
You can either use the `--admin-settings` installer flag on [macOS](/manuals/desktop/setup/install/mac-install.md#install-from-the-command-line) or [Windows](/manuals/desktop/setup/install/windows-install.md#install-from-the-command-line) to automatically create the `admin-settings.json` and save it in the correct location, or set it up manually.
4138

@@ -52,7 +49,7 @@ To set it up manually:
5249
>
5350
> It is assumed that you have the ability to push the `admin-settings.json` settings file to the locations specified through a device management software such as [Jamf](https://www.jamf.com/lp/en-gb/apple-mobile-device-management-mdm-jamf-shared/?attr=google_ads-brand-search-shared&gclid=CjwKCAjw1ICZBhAzEiwAFfvFhEXjayUAi8FHHv1JJitFPb47C_q_RCySTmF86twF1qJc_6GST-YDmhoCuJsQAvD_BwE).
5451
55-
## Step two: Configure the settings you want to lock in
52+
## Step two: Configure settings
5653

5754
> [!NOTE]
5855
>
@@ -64,7 +61,6 @@ If `locked: true`, users aren't able to edit this setting from Docker Desktop or
6461

6562
If `locked: false`, it's similar to setting a factory default in that:
6663
- For new installs, `locked: false` pre-populates the relevant settings in the Docker Desktop Dashboard, but users are able to modify it.
67-
6864
- If Docker Desktop is already installed and being used, `locked: false` is ignored. This is because existing users of Docker Desktop may have already updated a setting, which in turn will have been written to the relevant config file, for example the `settings-store.json` (or `settings.json` for Docker Desktop versions 4.34 and earlier) or `daemon.json`. In these instances, the user's preferences are respected and the values aren't altered. These can be controlled by setting `locked: true`.
6965

7066
The following `admin-settings.json` code and table provides an example of the required syntax and descriptions for parameters and values:
@@ -301,10 +297,11 @@ The following `admin-settings.json` code and table provides an example of the re
301297
For settings to take effect:
302298
- On a new install, developers need to launch Docker Desktop and authenticate to their organization.
303299
- On an existing install, developers need to quit Docker Desktop through the Docker menu, and then re-launch Docker Desktop. If they are already signed in, they don't need to sign in again for the changes to take effect.
300+
304301
> [!IMPORTANT]
305302
>
306303
> Selecting **Restart** from the Docker menu isn't enough as it only restarts some components of Docker Desktop.
307304
308-
So as not to disrupt your developers' workflow, Docker doesn't automatically mandate that developers re-launch and re-authenticate once a change has been made.
305+
To avoid disrupting your developers' workflow, Docker doesn't automatically mandate that developers re-launch and re-authenticate once a change has been made.
309306

310307
In Docker Desktop, developers see the relevant settings grayed out.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,9 +796,9 @@ Docker-in-Docker or containerized CI agents.
796796
- **Configure this setting with:**
797797
- **Advanced** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
798798

799-
## Settings not available in the Docker Desktop UI
799+
## Settings not available in the Docker Desktop GUI
800800

801-
The following settings aren’t shown in the Docker Desktop UI. You can only configure them using Settings Management with the Admin Console or the `admin-settings.json` file.
801+
The following settings aren’t shown in the Docker Desktop GUI. You can only configure them using Settings Management with the Admin Console or the `admin-settings.json` file.
802802

803803
### Block `docker load`
804804

0 commit comments

Comments
 (0)