From 7ad211d8ca1823e56ccad78c7dbe7f163ba5bce7 Mon Sep 17 00:00:00 2001 From: sarahsanders-docker Date: Wed, 16 Apr 2025 09:24:12 -0400 Subject: [PATCH 1/3] caveats for admin-settings.json --- .../settings-management/configure-json-file.md | 18 +++++++++++++++++- hugo_stats.json | 4 ++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md index 9b61004cf50..3b43789fe33 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md @@ -17,7 +17,23 @@ Settings Management is designed specifically for organizations who don’t give ## Prerequisites -You first need to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) to ensure that all Docker Desktop developers authenticate with your organization. Since Settings Management requires a Docker Business subscription, enforced sign-in guarantees that only authenticated users have access and that the feature consistently takes effect across all users, even though it may still work without enforced sign-in. +You must [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) to ensure that all Docker Desktop users authentication with your organization. + +Settings management requires a Docker Business suubscription. 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. + +> [!IMPORTANT] +> +> 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. + + +## Known limitations + +The `admin-settings.json` file requires users to authenticate with Docker Hub and be a member +of an organization with a Docker Business subscription. This means the file does not work in: + +- Air-grapped or offline environments where Docker Desktop can't authenticate with Docker Hub. +- Restricted environments where SSO and cloud-based authentication are not permitted. + ## Step one: Create the `admin-settings.json` file and save it in the correct location diff --git a/hugo_stats.json b/hugo_stats.json index a01b564ea82..c940976a29e 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -13,6 +13,7 @@ "-v", "-z-10", ".NET", + "AWS-Route-53", "Admin-Console", "After", "Angular", @@ -53,6 +54,8 @@ "Git-Bash-CLI", "GitLab", "Go", + "GoDaddy", + "Google-Cloud-DNS", "HTTP", "Heredocs", "Hyper-V-backend-x86_64", @@ -82,6 +85,7 @@ "Okta", "Okta-SAML", "Old-Dockerfile", + "Other-providers", "PHP", "PowerShell", "PowerShell-CLI", From 41e5f57cfceeb148cb93b1a82586511d2cd46da2 Mon Sep 17 00:00:00 2001 From: sarahsanders-docker Date: Wed, 16 Apr 2025 09:27:56 -0400 Subject: [PATCH 2/3] nit: --- .../hardened-desktop/settings-management/configure-json-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md index 3b43789fe33..3a109eded97 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md @@ -17,7 +17,7 @@ Settings Management is designed specifically for organizations who don’t give ## Prerequisites -You must [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) to ensure that all Docker Desktop users authentication with your organization. +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. Settings management requires a Docker Business suubscription. 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. From 3699a46d406371d939ee89fb62e960e5e1aecbcd Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Thu, 17 Apr 2025 14:11:37 -0400 Subject: [PATCH 3/3] Update content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> --- .../hardened-desktop/settings-management/configure-json-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md index 3a109eded97..0096692d5a8 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md @@ -19,7 +19,7 @@ Settings Management is designed specifically for organizations who don’t give 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. -Settings management requires a Docker Business suubscription. 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. +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. > [!IMPORTANT] >