diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md index f7c6dc58e34..fdbc348c76b 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner/_index.md @@ -3,9 +3,6 @@ title: Docker Model Runner linkTitle: Model Runner params: sidebar: - badge: - color: blue - text: Beta group: AI weight: 20 description: Learn how to use Docker Model Runner to manage and run AI models. diff --git a/content/manuals/ai/model-runner/get-started.md b/content/manuals/ai/model-runner/get-started.md index 727e63d5353..0d8714f3b4e 100644 --- a/content/manuals/ai/model-runner/get-started.md +++ b/content/manuals/ai/model-runner/get-started.md @@ -11,7 +11,7 @@ Get started with [Docker Model Runner](_index.md). ### Enable DMR in Docker Desktop -1. In the settings view, go to the **Beta features** tab. +1. In the settings view, go to the **AI** tab. 1. Select the **Enable Docker Model Runner** setting. 1. If you use Windows with a supported NVIDIA GPU, you also see and can select **Enable GPU-backed inference**. @@ -27,8 +27,8 @@ with your local models in the **Models** tab in the Docker Desktop Dashboard. > [!IMPORTANT] > -> For Docker Desktop versions 4.41 and earlier, this setting was under the -> **Experimental features** tab on the **Features in development** page. +> For Docker Desktop versions 4.45 and earlier, this setting was under the +> **Beta features** tab. ### Enable DMR in Docker Engine diff --git a/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md index 9ebe21219bd..343304c9b40 100644 --- a/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md @@ -332,6 +332,15 @@ The following tables describe all available settings in the `admin-settings.json For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows). +### AI settings + +| Parameter | OS | Description | Version | +|:-----------------------------------------------------|----|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------| +| `enableInference` | | If `allowBetaFeatures` is true, setting `enableInference` to `true` enables [Docker Model Runner](/manuals/ai/model-runner/_index.md) by default. You can independently control this setting from the `allowBetaFeatures` setting. | | +|         `enableInferenceTCP` | | Enable host-side TCP support. This setting requires Docker Model Runner setting to be enabled first. | | +|         `enableInferenceTCPPort` | | Specifies the exposed TCP port. This setting requires Docker Model Runner setting to be enabled first. | | +|         `enableInferenceCORS` | | Specifies the allowed CORS origins. Empty string to deny all,`*` to accept all, or a list of comma-separated values. This setting requires Docker Model Runner setting to be enabled first. | | + ### Beta features > [!IMPORTANT] @@ -342,10 +351,6 @@ For more information, see [Networking](/manuals/desktop/features/networking.md#n |:-----------------------------------------------------|----|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------| | `allowBetaFeatures` | | If `value` is set to `true`, beta features are enabled. | | | `enableDockerAI` | | If `allowBetaFeatures` is true, setting `enableDockerAI` to `true` enables [Docker AI (Ask Gordon)](/manuals/ai/gordon/_index.md) by default. You can independently control this setting from the `allowBetaFeatures` setting. | | -| `enableInference` | | If `allowBetaFeatures` is true, setting `enableInference` to `true` enables [Docker Model Runner](/manuals/ai/model-runner/_index.md) by default. You can independently control this setting from the `allowBetaFeatures` setting. | | -|         `enableInferenceTCP` | | Enable host-side TCP support. This setting requires Docker Model Runner setting to be enabled first. | | -|         `enableInferenceTCPPort` | | Specifies the exposed TCP port. This setting requires Docker Model Runner setting to be enabled first. | | -|         `enableInferenceCORS` | | Specifies the allowed CORS origins. Empty string to deny all,`*` to accept all, or a list of comma-separated values. This setting requires Docker Model Runner setting to be enabled first. | | | `enableDockerMCPToolkit` | | If `allowBetaFeatures` is true, setting `enableDockerMCPToolkit` to `true` enables the [MCP Toolkit feature](/manuals/ai/mcp-catalog-and-toolkit/toolkit.md) by default. You can independently control this setting from the `allowBetaFeatures` setting. | | | `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | Docker Desktop version 4.41 and earlier | diff --git a/content/manuals/enterprise/security/hardened-desktop/settings-management/settings-reference.md b/content/manuals/enterprise/security/hardened-desktop/settings-management/settings-reference.md index 1c6d41b128e..35589996fa6 100644 --- a/content/manuals/enterprise/security/hardened-desktop/settings-management/settings-reference.md +++ b/content/manuals/enterprise/security/hardened-desktop/settings-management/settings-reference.md @@ -192,7 +192,7 @@ images are permitted. > [!WARNING] > -> QEMU has been deprecated in Docker Desktop versions 4.44 and later. For more information, see the [blog announcement](https://www.docker.com/blog/docker-desktop-for-mac-qemu-virtualization-option-to-be-deprecated-in-90-days/) +> QEMU has been deprecated in Docker Desktop versions 4.44 and later. For more information, see the [blog announcement](https://www.docker.com/blog/docker-desktop-for-mac-qemu-virtualization-option-to-be-deprecated-in-90-days/) | Default value | Accepted values | Format | |---------------|-----------------|----------| @@ -610,6 +610,62 @@ Builders settings lets you manage Buildx builder instances for advanced image-bu > > Builder definitions are structured as an array of objects, each describing a builder instance. Conflicting or unsupported configurations may cause build errors. +## AI settings + +### Enable Docker Model Runner + +| Default value | Accepted values | Format | +|---------------|-----------------|----------| +| `true` | `true`, `false` | Boolean | + +- **Description:** Docker Model Runner functionality for running AI models in containers. +- **OS:** {{< badge color=blue text="All" >}} +- **Use case:** Run and manage AI/ML models using Docker infrastructure. +- **Configure this setting with:** + - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) + +#### Enable host-side TCP support + +| Default value | Accepted values | Format | +|---------------|-----------------|----------| +| `false` | `true`, `false` | Boolean | + +- **Description:** TCP connectivity for Docker Model Runner services. +- **OS:** {{< badge color=blue text="All" >}} +- **Use case:** Allow external applications to connect to Model Runner via TCP. +- **Configure this setting with:** + - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) + +> [!NOTE] +> +> This setting requires Docker Model Runner setting to be enabled first. + +##### Port + +| Default value | Accepted values | Format | +|---------------|-----------------|---------| +| 12434 | Integer | Integer | + +- **Description:** Specific port used for Model Runner TCP connections. +- **OS:** {{< badge color=blue text="All" >}} +- **Use case:** Customize the port for Model Runner TCP connectivity. +- **Configure this setting with:** + - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - Settings Management: `enableInferenceTCP` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) + +##### CORS Allowed Origins + +| Default value | Accepted values | Format | +|---------------|---------------------------------------------------------------------------------|--------| +| Empty string | Empty string to deny all,`*` to accept all, or a list of comma-separated values | String | + +- **Description:** Cross-origin resource sharing settings for Model Runner web integration. +- **OS:** {{< badge color=blue text="All" >}} +- **Use case:** Allow web applications to connect to Model Runner services. +- **Configure this setting with:** + - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - Settings Management: `enableInferenceCORS` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) + ## Kubernetes settings ### Enable Kubernetes @@ -813,62 +869,6 @@ third-party or unvetted plugins from being installed. - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) -### Enable Docker Model Runner - -| Default value | Accepted values | Format | -|---------------|-----------------|----------| -| `true` | `true`, `false` | Boolean | - -- **Description:** Docker Model Runner functionality for running AI models in containers. -- **OS:** {{< badge color=blue text="All" >}} -- **Use case:** Run and manage AI/ML models using Docker infrastructure. -- **Configure this setting with:** - - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) - -#### Enable host-side TCP support - -| Default value | Accepted values | Format | -|---------------|-----------------|----------| -| `false` | `true`, `false` | Boolean | - -- **Description:** TCP connectivity for Docker Model Runner services. -- **OS:** {{< badge color=blue text="All" >}} -- **Use case:** Allow external applications to connect to Model Runner via TCP. -- **Configure this setting with:** - - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) - -> [!NOTE] -> -> This setting requires Docker Model Runner setting to be enabled first. - -##### Port - -| Default value | Accepted values | Format | -|---------------|-----------------|---------| -| 12434 | Integer | Integer | - -- **Description:** Specific port used for Model Runner TCP connections. -- **OS:** {{< badge color=blue text="All" >}} -- **Use case:** Customize the port for Model Runner TCP connectivity. -- **Configure this setting with:** - - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - - Settings Management: `enableInferenceTCP` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) - -##### CORS Allowed Origins - -| Default value | Accepted values | Format | -|---------------|---------------------------------------------------------------------------------|--------| -| Empty string | Empty string to deny all,`*` to accept all, or a list of comma-separated values | String | - -- **Description:** Cross-origin resource sharing settings for Model Runner web integration. -- **OS:** {{< badge color=blue text="All" >}} -- **Use case:** Allow web applications to connect to Model Runner services. -- **Configure this setting with:** - - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - - Settings Management: `enableInferenceCORS` setting in the [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md) - ### Enable Docker MCP Toolkit | Default value | Accepted values | Format | diff --git a/data/summary.yaml b/data/summary.yaml index ed9b11e42b6..aaab67eeb85 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -166,7 +166,6 @@ Docker Hardened Images: Docker Init: requires: Docker Desktop [4.27](/manuals/desktop/release-notes.md#4270) and later Docker Model Runner: - availability: Beta requires: Docker Engine or Docker Desktop (Windows) 4.41+ or Docker Desktop (MacOS) 4.40+ for: See Requirements section below Docker MCP Catalog and Toolkit: