diff --git a/content/desktop/hardened-desktop/settings-management/_index.md b/content/desktop/hardened-desktop/settings-management/_index.md index 1f7126235f..3a67b59147 100644 --- a/content/desktop/hardened-desktop/settings-management/_index.md +++ b/content/desktop/hardened-desktop/settings-management/_index.md @@ -39,6 +39,7 @@ Using the `admin-settings.json` file, admins can: - Configure Docker Engine - Turn off Docker Desktop's ability to checks for updates - Turn off Docker Extensions +- Turn off Docker Scout SBOM indexing For more details on the syntax and options admins can set, see [Configure Settings Management](configure.md). @@ -58,4 +59,4 @@ Docker doesn't automatically mandate that developers re-launch and re-authentica Any settings that are enforced, are grayed out in Docker Desktop and the user is unable to edit them, either via the Docker Desktop UI, CLI, or the `settings.json` file. In addition, if Enhanced Container Isolation is enforced, users can't use privileged containers or similar techniques to modify enforced settings within the Docker Desktop Linux VM, for example, reconfigure proxy and networking of reconfigure Docker Engine. -![Proxy settings grayed out](/assets/images/grayed-setting.png) \ No newline at end of file +![Proxy settings grayed out](/assets/images/grayed-setting.png) diff --git a/content/desktop/hardened-desktop/settings-management/configure.md b/content/desktop/hardened-desktop/settings-management/configure.md index 45068e7a57..901c8ffc47 100644 --- a/content/desktop/hardened-desktop/settings-management/configure.md +++ b/content/desktop/hardened-desktop/settings-management/configure.md @@ -108,6 +108,11 @@ The following `admin-settings.json` code and table provides an example of the re "extensionsEnabled": { "value": false, "locked": true + }, + "scout": { + "locked": false, + "sbomIndexing": true, + "useBackgroundIndexing": true } } ``` @@ -129,6 +134,7 @@ The following `admin-settings.json` code and table provides an example of the re |`disableUpdate`| |If `value` is set to true, checking for and notifications about Docker Desktop updates is disabled.| |`analyticsEnabled`| |If `value` is set to false, Docker Desktop doesn't send usage statistics to Docker. | |`extensionsEnabled`| |If `value` is set to false, Docker extensions are disabled. | +|`scout`|| Setting `useBackgroundIndexing` to `false` disables automatic indexing of images loaded to the image store. Setting `sbomIndexing` to `false` prevents the manual indexing triggered by inspecting an image in Docker Desktop.

**Note**: Users can still use the `docker scout` CLI commands to index images, even if indexing is disabled in Settings Management. | ### Step three: Re-launch Docker Desktop >**Note** @@ -148,4 +154,4 @@ Docker doesn't automatically mandate that developers re-launch and sign in once In Docker Desktop, developers see the relevant settings grayed out and the message **Locked by your administrator**. -![Proxy settings grayed out with Settings Management](/assets/images/grayed-setting.png) \ No newline at end of file +![Proxy settings grayed out with Settings Management](/assets/images/grayed-setting.png) diff --git a/content/desktop/settings/linux.md b/content/desktop/settings/linux.md index a130d53ad6..0cb783904d 100644 --- a/content/desktop/settings/linux.md +++ b/content/desktop/settings/linux.md @@ -44,6 +44,10 @@ If you choose the integrated terminal, you can run commands in a running contain - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively. +- **SBOM Indexing**. When this option is enabled, inspecting an image in Docker Desktop shows a **Start analysis** button that, when selected, analyzes the image with Docker Scout. + +- **Enable background SBOM indexing**. When this option is enabled, Docker Scout automatically analyzes images that you build or pull. + ## Resources The **Resources** tab allows you to configure CPU, memory, disk, proxies, diff --git a/content/desktop/settings/mac.md b/content/desktop/settings/mac.md index 9e92f741fa..035fbfc131 100644 --- a/content/desktop/settings/mac.md +++ b/content/desktop/settings/mac.md @@ -64,6 +64,10 @@ If you choose the integrated terminal, you can run commands in a running contain - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively. +- **SBOM Indexing**. When this option is enabled, inspecting an image in Docker Desktop shows a **Start analysis** button that, when selected, analyzes the image with Docker Scout. + +- **Enable background SBOM indexing**. When this option is enabled, Docker Scout automatically analyzes images that you build or pull. + ## Resources The **Resources** tab allows you to configure CPU, memory, disk, proxies, diff --git a/content/desktop/settings/windows.md b/content/desktop/settings/windows.md index ee34d41950..0410efaa1b 100644 --- a/content/desktop/settings/windows.md +++ b/content/desktop/settings/windows.md @@ -53,6 +53,10 @@ On the **General** tab, you can configure when to start Docker and specify other - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively. +- **SBOM Indexing**. When this option is enabled, inspecting an image in Docker Desktop shows a **Start analysis** button that, when selected, analyzes the image with Docker Scout. + +- **Enable background SBOM indexing**. When this option is enabled, Docker Scout automatically analyzes images that you build or pull. + ## Resources The **Resources** tab allows you to configure CPU, memory, disk, proxies,