From 62b02cc247bd91336851aba8300a1a6a149df9c9 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 4 Jun 2025 16:16:49 +0200 Subject: [PATCH 1/8] Revert "Revert "DMR: GUI docs"" (#22769) Reverts the revert. --- content/manuals/_index.md | 2 +- .../_index.md} | 82 ++++++++++++++----- data/redirects.yml | 4 +- 3 files changed, 66 insertions(+), 22 deletions(-) rename content/manuals/ai/{model-runner.md => model-runner/_index.md} (83%) diff --git a/content/manuals/_index.md b/content/manuals/_index.md index f90b12bc4887..43eb7dc6cebb 100644 --- a/content/manuals/_index.md +++ b/content/manuals/_index.md @@ -39,7 +39,7 @@ params: - title: Docker Model Runner description: View and manage your local models. icon: view_in_ar - link: /model-runner/ + link: /ai/model-runner/ - title: MCP Catalog and Toolkit description: Augment your AI workflow with MCP servers. icon: /icons/toolkit.svg diff --git a/content/manuals/ai/model-runner.md b/content/manuals/ai/model-runner/_index.md similarity index 83% rename from content/manuals/ai/model-runner.md rename to content/manuals/ai/model-runner/_index.md index 279336575d95..56dc11dcae8c 100644 --- a/content/manuals/ai/model-runner.md +++ b/content/manuals/ai/model-runner/_index.md @@ -11,24 +11,27 @@ description: Learn how to use Docker Model Runner to manage and run AI models. keywords: Docker, ai, model runner, docker desktop, docker engine, llm aliases: - /desktop/features/model-runner/ - - /ai/model-runner/ + - /model-runner/ --- {{< summary-bar feature_name="Docker Model Runner" >}} -The Docker Model Runner plugin lets you: +## Key features -- [Pull models from Docker Hub](https://hub.docker.com/u/ai) -- Run AI models directly from the command line -- Manage local models (add, list, remove) -- Interact with models using a submitted prompt or in chat mode in the CLI or Docker Desktop Dashboard -- Push models to Docker Hub +- [Pull and push models to and from Docker Hub](https://hub.docker.com/u/ai) +- Run and interact with AI models directly from the command line or from the Docker Desktop GUI +- Manage local models and display logs + +## How it works Models are pulled from Docker Hub the first time they're used and stored locally. They're loaded into memory only at runtime when a request is made, and unloaded when not in use to optimize resources. Since models can be large, the initial pull may take some time — but after that, they're cached locally for faster access. You can interact with the model using [OpenAI-compatible APIs](#what-api-endpoints-are-available). > [!TIP] > -> Using Testcontainers or Docker Compose? [Testcontainers for Java](https://java.testcontainers.org/modules/docker_model_runner/) and [Go](https://golang.testcontainers.org/modules/dockermodelrunner/), and [Docker Compose](/manuals/compose/how-tos/model-runner.md) now support Docker Model Runner. +> Using Testcontainers or Docker Compose? +> [Testcontainers for Java](https://java.testcontainers.org/modules/docker_model_runner/) +> and [Go](https://golang.testcontainers.org/modules/dockermodelrunner/), and +> [Docker Compose](/manuals/compose/how-tos/model-runner.md) now support Docker Model Runner. ## Enable Docker Model Runner @@ -76,7 +79,58 @@ You can now use the `docker model` command in the CLI and view and interact with $ docker model run ai/smollm2 ``` -## Integrate the Docker Model Runner into your software development lifecycle +## Pull a model + +Models are cached locally. + +{{< tabs >}} +{{< tab name="From Docker Desktop">}} + +1. Select **Models** and select the **Docker Hub** tab. +2. Find the model of your choice and select **Pull**. + +{{< /tab >}} +{{< tab name="From the Docker CLI">}} + +Use the [`docker model pull` command](/reference/cli/docker/). + +{{< /tab >}} +{{< /tabs >}} + +## Run a model + +{{< tabs >}} +{{< tab name="From Docker Desktop">}} + +Select **Models** and select the **Local** tab and click the play button. +The interactive chat screen opens. + +{{< /tab >}} +{{< tab name="From the Docker CLI">}} + +Use the [`docker model run` command](/reference/cli/docker/). + +{{< /tab >}} +{{< /tabs >}} + +## Troubleshooting + +To troubleshoot potential issues, display the logs: + +{{< tabs >}} +{{< tab name="From Docker Desktop">}} + +Select **Models** and select the **Logs** tab. + +{{< /tab >}} +{{< tab name="From the Docker CLI">}} + +Use the [`docker model log` command](/reference/cli/docker/). + +{{< /tab >}} +{{< /tabs >}} + +## Example: Integrate Docker Model Runner into your software development lifecycle You can now start building your Generative AI application powered by the Docker Model Runner. @@ -164,7 +218,6 @@ with `/exp/vDD4.40`. > [!NOTE] > You can omit `llama.cpp` from the path. For example: `POST /engines/v1/chat/completions`. - ### How do I interact through the OpenAI API? #### From within a container @@ -280,12 +333,3 @@ The Docker Model CLI currently lacks consistent support for specifying models by ## Share feedback Thanks for trying out Docker Model Runner. Give feedback or report any bugs you may find through the **Give feedback** link next to the **Enable Docker Model Runner** setting. - -## Disable the feature - -To disable Docker Model Runner: - -1. Open the **Settings** view in Docker Desktop. -2. Navigate to the **Beta** tab in **Features in development**. -3. Clear the **Enable Docker Model Runner** checkbox. -4. Select **Apply & restart**. diff --git a/data/redirects.yml b/data/redirects.yml index aed83e6b2667..2fa714d311e1 100644 --- a/data/redirects.yml +++ b/data/redirects.yml @@ -284,7 +284,8 @@ - /go/mcp-toolkit/ # Desktop DMR -"/model-runner/": + +"/ai/model-runner/": - /go/model-runner/ # Docker Desktop - volumes cloud backup @@ -338,4 +339,3 @@ - /go/permissions/ "/desktop/setup/install/mac-permission-requirements/#binding-privileged-ports": - /go/port-mapping/ - \ No newline at end of file From e9e78a3032bcec19c8401c0caa4cc87cc81834fb Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Wed, 4 Jun 2025 19:20:11 +0100 Subject: [PATCH 2/8] Merge pull request #22773 from aevesdocker/ENGDOCS-2696 Desktop: rm experimental tab --- content/manuals/ai/gordon/_index.md | 17 ++++++-------- content/manuals/ai/model-runner/_index.md | 15 ++++++------- .../settings-and-maintenance/settings.md | 22 +++++++------------ .../configure-json-file.md | 12 +++++----- .../settings-management/settings-reference.md | 12 ++++++---- data/summary.yaml | 2 +- 6 files changed, 37 insertions(+), 43 deletions(-) diff --git a/content/manuals/ai/gordon/_index.md b/content/manuals/ai/gordon/_index.md index 6cd19cd555be..83b1faf5fd56 100644 --- a/content/manuals/ai/gordon/_index.md +++ b/content/manuals/ai/gordon/_index.md @@ -86,21 +86,18 @@ If you have concerns about data collection or usage, you can ## Enable Ask Gordon 1. Sign in to your Docker account. -2. Navigate to the **Features in development** tab in settings. -3. Under the **Experimental features** tab, select **Access experimental features**. -4. Select **Apply and restart**. -5. Quit and reopen Docker Desktop to ensure the changes take effect. -6. Open the **Settings** view in Docker Desktop. -7. Navigate to **Features in development**. -8. From the **Beta** tab, check the **Enable Docker AI** checkbox. +2. Navigate to the **Beta features** tab in settings. +3. Check the **Enable Docker AI** checkbox. The Docker AI terms of service agreement is displayed. You must agree to the terms before you can enable the feature. Review the terms and select **Accept and enable** to continue. -9. Select **Apply & restart**. +4. Select **Apply & restart**. -You can also enable Ask Gordon from the **Ask Gordon** tab if you have selected the **Access experimental features** setting. Simply select the **Enable Ask Gordon** button, and then accept the Docker AI terms of service agreement. +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page. ## Using Ask Gordon @@ -204,7 +201,7 @@ across several dimensions: If you've enabled Ask Gordon and you want to disable it again: 1. Open the **Settings** view in Docker Desktop. -2. Navigate to **Features in development**. +2. Navigate to **Beta features**. 3. Clear the **Enable Docker AI** checkbox. 4. Select **Apply & restart**. diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md index 56dc11dcae8c..3b6473fd185e 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner/_index.md @@ -37,17 +37,16 @@ Models are pulled from Docker Hub the first time they're used and stored locally ### Enable DMR in Docker Desktop -1. Navigate to the **Features in development** tab in settings. -2. Under the **Experimental features** tab, select **Access experimental features**. -3. Select **Apply and restart**. -4. Quit and reopen Docker Desktop to ensure the changes take effect. -5. Open the **Settings** view in Docker Desktop. -6. Navigate to **Features in development**. -7. From the **Beta** tab, tick the **Enable Docker Model Runner** setting. -8. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting. +1. Navigate to the **Beta features** tab in settings. +2. Tick the **Enable Docker Model Runner** setting. +3. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting. You can now use the `docker model` command in the CLI and view and interact with your local models in the **Models** tab in the Docker Desktop Dashboard. +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page. + ### Enable DMR in Docker Engine 1. Ensure you have installed [Docker Engine](/engine/install/). diff --git a/content/manuals/desktop/settings-and-maintenance/settings.md b/content/manuals/desktop/settings-and-maintenance/settings.md index ab4cb2d88467..d43c9d1cc4ef 100644 --- a/content/manuals/desktop/settings-and-maintenance/settings.md +++ b/content/manuals/desktop/settings-and-maintenance/settings.md @@ -472,13 +472,7 @@ Use the **Extensions** tab to: For more information about Docker extensions, see [Extensions](/manuals/extensions/_index.md). -## Features in development - -On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**. - -You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Features in development** tab. - -### Beta features +## Beta features Beta features provide access to future product functionality. These features are intended for testing and feedback only as they may change @@ -486,16 +480,16 @@ between releases without warning or remove them entirely from a future release. Beta features must not be used in production environments. Docker doesn't offer support for beta features. -### Experimental features - -Experimental features provide early access to future product functionality. -These features are intended for testing and feedback only as they may change -between releases without warning or can be removed entirely from a future -release. Experimental features must not be used in production environments. -Docker does not offer support for experimental features. +You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Beta features** tab. For a list of current experimental features in the Docker CLI, see [Docker CLI Experimental features](https://github.com/docker/cli/blob/master/experimental/README.md). +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, there is also an **Experimental features** tab under the **Features in development** page. +> +> As with beta features, experimental features must not be used in production environments. Docker does not offer support for experimental features. + ## Notifications Use the **Notifications** tab to turn on or turn off notifications for the following events: 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 3f379f82308b..566117949106 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 @@ -165,10 +165,6 @@ of configurable settings for the `admin-settings.json` file, see [`admin-setting "sbomIndexing": true, "useBackgroundIndexing": true }, - "allowExperimentalFeatures": { - "locked": false, - "value": false - }, "allowBetaFeatures": { "locked": false, "value": false @@ -310,14 +306,18 @@ quit and reopened. For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows). -### Features in development +### Beta features + +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page. | Parameter | OS | Description | Version | |:----------------------------|----|:--------------------------------------------------------------------------------------------------------------------------------------------------------------|---------| -| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | | | `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). | | | `enableDockerMCPToolkit` | | If `allowBetaFeatures` is true, setting `enableDockerMCPToolkit` to `true` enables the [MCP toolkit feature](/manuals/ai/mcp-catalog-and-toolkit/toolkit.md). | | +| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | Docker Desktop version 4.41 and earlier | ### Enhanced Container Isolation diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md index 5a44a0e0fe43..84eaa60eafce 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md @@ -763,7 +763,11 @@ third-party or unvetted plugins from being installed. - **Configure this setting with:** - **Extensions** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) -## Features in development +## Beta features + +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page. ### Enable Docker AI @@ -775,7 +779,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable AI features like "Ask Gordon". - **Configure this setting with:** - - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md) ### Enable Docker Model Runner @@ -788,7 +792,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable Docker Model Runner features. - **Configure this setting with:** - - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) ### Enable host-side TCP support @@ -800,7 +804,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable Docker Model Runner features. - **Configure this setting with:** - - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) > [!NOTE] > diff --git a/data/summary.yaml b/data/summary.yaml index 5d1410492f5a..0854d1d5549d 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -70,7 +70,7 @@ Compliance reporting: Compose attach: requires: Docker Compose [2.20.0](/manuals/compose/releases/release-notes.md#2200) and later Compose bridge: - availability: Experimental + availability: Beta Config profiles: requires: Docker Desktop 4.36 and later Compose dependent images: From 17ef8a68a3a086cfa3d95414a63815f776e95e79 Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 5 Jun 2025 09:01:58 +0200 Subject: [PATCH 3/8] ux: touch up tabs (#22774) Reduce magins, add hover effect, add light background ![Frame 31](https://github.com/user-attachments/assets/1b028adf-3baf-4588-9161-329b272ffb8e) --- .vscode/docker.code-snippets | 10 +++++----- assets/css/components.css | 12 ++++++++++++ content/manuals/ai/model-runner/_index.md | 8 ++++---- layouts/shortcodes/tabs.html | 7 +++---- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.vscode/docker.code-snippets b/.vscode/docker.code-snippets index 4342ae2890ee..6f05322140dc 100644 --- a/.vscode/docker.code-snippets +++ b/.vscode/docker.code-snippets @@ -23,15 +23,15 @@ "prefix": ["admonition", "tabs"], "body": [ "", - "{{< tabs >}}", - "{{< tab name=\"$1\">}}", + "{{< tabs group=\"$1\" >}}", + "{{< tab name=\"$2\">}}", "", - "$2", + "$3", "", "{{< /tab >}}", - "{{< tab name=\"$3\">}}", + "{{< tab name=\"$4\">}}", "", - "$4", + "$5", "", "{{< /tab >}}", "{{}}", diff --git a/assets/css/components.css b/assets/css/components.css index bfb1ef702cdb..4e7a2234d3a0 100644 --- a/assets/css/components.css +++ b/assets/css/components.css @@ -101,3 +101,15 @@ .summary-bar { @apply my-1 mt-4 flex flex-col rounded-sm border-1 border-gray-100 bg-gray-50 p-4 dark:border-gray-800 dark:bg-gray-900; } + +.tabs { + @apply bg-blue/2 rounded-sm p-2; +} +.tablist { + @apply mb-1 border-b border-gray-100 dark:border-gray-800; +} + +.tab-item { + @apply inline-block rounded-sm px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-900; + @apply dark:text-gray-200; +} diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md index 3b6473fd185e..5d9b647dbfd4 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner/_index.md @@ -82,7 +82,7 @@ You can now use the `docker model` command in the CLI and view and interact with Models are cached locally. -{{< tabs >}} +{{< tabs group="release" >}} {{< tab name="From Docker Desktop">}} 1. Select **Models** and select the **Docker Hub** tab. @@ -98,14 +98,14 @@ Use the [`docker model pull` command](/reference/cli/docker/). ## Run a model -{{< tabs >}} +{{< tabs group="release" >}} {{< tab name="From Docker Desktop">}} Select **Models** and select the **Local** tab and click the play button. The interactive chat screen opens. {{< /tab >}} -{{< tab name="From the Docker CLI">}} +{{< tab name="From the Docker CLI" >}} Use the [`docker model run` command](/reference/cli/docker/). @@ -116,7 +116,7 @@ Use the [`docker model run` command](/reference/cli/docker/). To troubleshoot potential issues, display the logs: -{{< tabs >}} +{{< tabs group="release" >}} {{< tab name="From Docker Desktop">}} Select **Models** and select the **Logs** tab. diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html index 3c8fff5f8361..d8d1e3119486 100644 --- a/layouts/shortcodes/tabs.html +++ b/layouts/shortcodes/tabs.html @@ -6,6 +6,7 @@
-
+
{{ range (.Store.Get "tabs") }}
-
{{ range (.Store.Get "tabs") }}
{{ end }}
-
From 7b0b813919066f7aa93985e02abc7192838102f3 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 5 Jun 2025 08:15:06 +0100 Subject: [PATCH 4/8] Revert "Desktop: rm experimental tab" (#22778) Reverts docker/docs#22773 --- content/manuals/ai/gordon/_index.md | 17 ++++++++------ content/manuals/ai/model-runner/_index.md | 15 +++++++------ .../settings-and-maintenance/settings.md | 22 ++++++++++++------- .../configure-json-file.md | 12 +++++----- .../settings-management/settings-reference.md | 12 ++++------ data/summary.yaml | 2 +- 6 files changed, 43 insertions(+), 37 deletions(-) diff --git a/content/manuals/ai/gordon/_index.md b/content/manuals/ai/gordon/_index.md index 83b1faf5fd56..6cd19cd555be 100644 --- a/content/manuals/ai/gordon/_index.md +++ b/content/manuals/ai/gordon/_index.md @@ -86,18 +86,21 @@ If you have concerns about data collection or usage, you can ## Enable Ask Gordon 1. Sign in to your Docker account. -2. Navigate to the **Beta features** tab in settings. -3. Check the **Enable Docker AI** checkbox. +2. Navigate to the **Features in development** tab in settings. +3. Under the **Experimental features** tab, select **Access experimental features**. +4. Select **Apply and restart**. +5. Quit and reopen Docker Desktop to ensure the changes take effect. +6. Open the **Settings** view in Docker Desktop. +7. Navigate to **Features in development**. +8. From the **Beta** tab, check the **Enable Docker AI** checkbox. The Docker AI terms of service agreement is displayed. You must agree to the terms before you can enable the feature. Review the terms and select **Accept and enable** to continue. -4. Select **Apply & restart**. +9. Select **Apply & restart**. -> [!IMPORTANT] -> -> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page. +You can also enable Ask Gordon from the **Ask Gordon** tab if you have selected the **Access experimental features** setting. Simply select the **Enable Ask Gordon** button, and then accept the Docker AI terms of service agreement. ## Using Ask Gordon @@ -201,7 +204,7 @@ across several dimensions: If you've enabled Ask Gordon and you want to disable it again: 1. Open the **Settings** view in Docker Desktop. -2. Navigate to **Beta features**. +2. Navigate to **Features in development**. 3. Clear the **Enable Docker AI** checkbox. 4. Select **Apply & restart**. diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md index 5d9b647dbfd4..69cc326cdf29 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner/_index.md @@ -37,16 +37,17 @@ Models are pulled from Docker Hub the first time they're used and stored locally ### Enable DMR in Docker Desktop -1. Navigate to the **Beta features** tab in settings. -2. Tick the **Enable Docker Model Runner** setting. -3. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting. +1. Navigate to the **Features in development** tab in settings. +2. Under the **Experimental features** tab, select **Access experimental features**. +3. Select **Apply and restart**. +4. Quit and reopen Docker Desktop to ensure the changes take effect. +5. Open the **Settings** view in Docker Desktop. +6. Navigate to **Features in development**. +7. From the **Beta** tab, tick the **Enable Docker Model Runner** setting. +8. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting. You can now use the `docker model` command in the CLI and view and interact with your local models in the **Models** tab in the Docker Desktop Dashboard. -> [!IMPORTANT] -> -> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page. - ### Enable DMR in Docker Engine 1. Ensure you have installed [Docker Engine](/engine/install/). diff --git a/content/manuals/desktop/settings-and-maintenance/settings.md b/content/manuals/desktop/settings-and-maintenance/settings.md index d43c9d1cc4ef..ab4cb2d88467 100644 --- a/content/manuals/desktop/settings-and-maintenance/settings.md +++ b/content/manuals/desktop/settings-and-maintenance/settings.md @@ -472,7 +472,13 @@ Use the **Extensions** tab to: For more information about Docker extensions, see [Extensions](/manuals/extensions/_index.md). -## Beta features +## Features in development + +On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**. + +You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Features in development** tab. + +### Beta features Beta features provide access to future product functionality. These features are intended for testing and feedback only as they may change @@ -480,15 +486,15 @@ between releases without warning or remove them entirely from a future release. Beta features must not be used in production environments. Docker doesn't offer support for beta features. -You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Beta features** tab. +### Experimental features -For a list of current experimental features in the Docker CLI, see [Docker CLI Experimental features](https://github.com/docker/cli/blob/master/experimental/README.md). +Experimental features provide early access to future product functionality. +These features are intended for testing and feedback only as they may change +between releases without warning or can be removed entirely from a future +release. Experimental features must not be used in production environments. +Docker does not offer support for experimental features. -> [!IMPORTANT] -> -> For Docker Desktop versions 4.41 and earlier, there is also an **Experimental features** tab under the **Features in development** page. -> -> As with beta features, experimental features must not be used in production environments. Docker does not offer support for experimental features. +For a list of current experimental features in the Docker CLI, see [Docker CLI Experimental features](https://github.com/docker/cli/blob/master/experimental/README.md). ## Notifications 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 566117949106..3f379f82308b 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 @@ -165,6 +165,10 @@ of configurable settings for the `admin-settings.json` file, see [`admin-setting "sbomIndexing": true, "useBackgroundIndexing": true }, + "allowExperimentalFeatures": { + "locked": false, + "value": false + }, "allowBetaFeatures": { "locked": false, "value": false @@ -306,18 +310,14 @@ quit and reopened. For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows). -### Beta features - -> [!IMPORTANT] -> -> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page. +### Features in development | Parameter | OS | Description | Version | |:----------------------------|----|:--------------------------------------------------------------------------------------------------------------------------------------------------------------|---------| +| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | | | `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). | | | `enableDockerMCPToolkit` | | If `allowBetaFeatures` is true, setting `enableDockerMCPToolkit` to `true` enables the [MCP toolkit feature](/manuals/ai/mcp-catalog-and-toolkit/toolkit.md). | | -| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | Docker Desktop version 4.41 and earlier | ### Enhanced Container Isolation diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md index 84eaa60eafce..5a44a0e0fe43 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md @@ -763,11 +763,7 @@ third-party or unvetted plugins from being installed. - **Configure this setting with:** - **Extensions** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) -## Beta features - -> [!IMPORTANT] -> -> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page. +## Features in development ### Enable Docker AI @@ -779,7 +775,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable AI features like "Ask Gordon". - **Configure this setting with:** - - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md) ### Enable Docker Model Runner @@ -792,7 +788,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable Docker Model Runner features. - **Configure this setting with:** - - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) ### Enable host-side TCP support @@ -804,7 +800,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable Docker Model Runner features. - **Configure this setting with:** - - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) > [!NOTE] > diff --git a/data/summary.yaml b/data/summary.yaml index 0854d1d5549d..5d1410492f5a 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -70,7 +70,7 @@ Compliance reporting: Compose attach: requires: Docker Compose [2.20.0](/manuals/compose/releases/release-notes.md#2200) and later Compose bridge: - availability: Beta + availability: Experimental Config profiles: requires: Docker Desktop 4.36 and later Compose dependent images: From 5485c9f412c063bbfe4b30dbe1971cf5d59aea25 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 5 Jun 2025 08:21:51 +0100 Subject: [PATCH 5/8] Revert "ux: touch up tabs" (#22779) Reverts docker/docs#22774 --- .vscode/docker.code-snippets | 10 +++++----- assets/css/components.css | 12 ------------ content/manuals/ai/model-runner/_index.md | 8 ++++---- layouts/shortcodes/tabs.html | 7 ++++--- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/.vscode/docker.code-snippets b/.vscode/docker.code-snippets index 6f05322140dc..4342ae2890ee 100644 --- a/.vscode/docker.code-snippets +++ b/.vscode/docker.code-snippets @@ -23,15 +23,15 @@ "prefix": ["admonition", "tabs"], "body": [ "", - "{{< tabs group=\"$1\" >}}", - "{{< tab name=\"$2\">}}", + "{{< tabs >}}", + "{{< tab name=\"$1\">}}", "", - "$3", + "$2", "", "{{< /tab >}}", - "{{< tab name=\"$4\">}}", + "{{< tab name=\"$3\">}}", "", - "$5", + "$4", "", "{{< /tab >}}", "{{}}", diff --git a/assets/css/components.css b/assets/css/components.css index 4e7a2234d3a0..bfb1ef702cdb 100644 --- a/assets/css/components.css +++ b/assets/css/components.css @@ -101,15 +101,3 @@ .summary-bar { @apply my-1 mt-4 flex flex-col rounded-sm border-1 border-gray-100 bg-gray-50 p-4 dark:border-gray-800 dark:bg-gray-900; } - -.tabs { - @apply bg-blue/2 rounded-sm p-2; -} -.tablist { - @apply mb-1 border-b border-gray-100 dark:border-gray-800; -} - -.tab-item { - @apply inline-block rounded-sm px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-900; - @apply dark:text-gray-200; -} diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md index 69cc326cdf29..56dc11dcae8c 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner/_index.md @@ -83,7 +83,7 @@ You can now use the `docker model` command in the CLI and view and interact with Models are cached locally. -{{< tabs group="release" >}} +{{< tabs >}} {{< tab name="From Docker Desktop">}} 1. Select **Models** and select the **Docker Hub** tab. @@ -99,14 +99,14 @@ Use the [`docker model pull` command](/reference/cli/docker/). ## Run a model -{{< tabs group="release" >}} +{{< tabs >}} {{< tab name="From Docker Desktop">}} Select **Models** and select the **Local** tab and click the play button. The interactive chat screen opens. {{< /tab >}} -{{< tab name="From the Docker CLI" >}} +{{< tab name="From the Docker CLI">}} Use the [`docker model run` command](/reference/cli/docker/). @@ -117,7 +117,7 @@ Use the [`docker model run` command](/reference/cli/docker/). To troubleshoot potential issues, display the logs: -{{< tabs group="release" >}} +{{< tabs >}} {{< tab name="From Docker Desktop">}} Select **Models** and select the **Logs** tab. diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html index d8d1e3119486..3c8fff5f8361 100644 --- a/layouts/shortcodes/tabs.html +++ b/layouts/shortcodes/tabs.html @@ -6,7 +6,6 @@
-
+
{{ range (.Store.Get "tabs") }}
+
{{ range (.Store.Get "tabs") }}
{{ end }}
+
From a8e975ae6c5c036d3229eaf6a5957f0bf9c50f8b Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 5 Jun 2025 08:39:34 +0100 Subject: [PATCH 6/8] Revert "Revert "Revert "DMR: GUI docs""" (#22780) Reverts docker/docs#22769 --- content/manuals/_index.md | 2 +- .../_index.md => model-runner.md} | 82 +++++-------------- data/redirects.yml | 4 +- 3 files changed, 22 insertions(+), 66 deletions(-) rename content/manuals/ai/{model-runner/_index.md => model-runner.md} (83%) diff --git a/content/manuals/_index.md b/content/manuals/_index.md index 43eb7dc6cebb..f90b12bc4887 100644 --- a/content/manuals/_index.md +++ b/content/manuals/_index.md @@ -39,7 +39,7 @@ params: - title: Docker Model Runner description: View and manage your local models. icon: view_in_ar - link: /ai/model-runner/ + link: /model-runner/ - title: MCP Catalog and Toolkit description: Augment your AI workflow with MCP servers. icon: /icons/toolkit.svg diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner.md similarity index 83% rename from content/manuals/ai/model-runner/_index.md rename to content/manuals/ai/model-runner.md index 56dc11dcae8c..279336575d95 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner.md @@ -11,27 +11,24 @@ description: Learn how to use Docker Model Runner to manage and run AI models. keywords: Docker, ai, model runner, docker desktop, docker engine, llm aliases: - /desktop/features/model-runner/ - - /model-runner/ + - /ai/model-runner/ --- {{< summary-bar feature_name="Docker Model Runner" >}} -## Key features +The Docker Model Runner plugin lets you: -- [Pull and push models to and from Docker Hub](https://hub.docker.com/u/ai) -- Run and interact with AI models directly from the command line or from the Docker Desktop GUI -- Manage local models and display logs - -## How it works +- [Pull models from Docker Hub](https://hub.docker.com/u/ai) +- Run AI models directly from the command line +- Manage local models (add, list, remove) +- Interact with models using a submitted prompt or in chat mode in the CLI or Docker Desktop Dashboard +- Push models to Docker Hub Models are pulled from Docker Hub the first time they're used and stored locally. They're loaded into memory only at runtime when a request is made, and unloaded when not in use to optimize resources. Since models can be large, the initial pull may take some time — but after that, they're cached locally for faster access. You can interact with the model using [OpenAI-compatible APIs](#what-api-endpoints-are-available). > [!TIP] > -> Using Testcontainers or Docker Compose? -> [Testcontainers for Java](https://java.testcontainers.org/modules/docker_model_runner/) -> and [Go](https://golang.testcontainers.org/modules/dockermodelrunner/), and -> [Docker Compose](/manuals/compose/how-tos/model-runner.md) now support Docker Model Runner. +> Using Testcontainers or Docker Compose? [Testcontainers for Java](https://java.testcontainers.org/modules/docker_model_runner/) and [Go](https://golang.testcontainers.org/modules/dockermodelrunner/), and [Docker Compose](/manuals/compose/how-tos/model-runner.md) now support Docker Model Runner. ## Enable Docker Model Runner @@ -79,58 +76,7 @@ You can now use the `docker model` command in the CLI and view and interact with $ docker model run ai/smollm2 ``` -## Pull a model - -Models are cached locally. - -{{< tabs >}} -{{< tab name="From Docker Desktop">}} - -1. Select **Models** and select the **Docker Hub** tab. -2. Find the model of your choice and select **Pull**. - -{{< /tab >}} -{{< tab name="From the Docker CLI">}} - -Use the [`docker model pull` command](/reference/cli/docker/). - -{{< /tab >}} -{{< /tabs >}} - -## Run a model - -{{< tabs >}} -{{< tab name="From Docker Desktop">}} - -Select **Models** and select the **Local** tab and click the play button. -The interactive chat screen opens. - -{{< /tab >}} -{{< tab name="From the Docker CLI">}} - -Use the [`docker model run` command](/reference/cli/docker/). - -{{< /tab >}} -{{< /tabs >}} - -## Troubleshooting - -To troubleshoot potential issues, display the logs: - -{{< tabs >}} -{{< tab name="From Docker Desktop">}} - -Select **Models** and select the **Logs** tab. - -{{< /tab >}} -{{< tab name="From the Docker CLI">}} - -Use the [`docker model log` command](/reference/cli/docker/). - -{{< /tab >}} -{{< /tabs >}} - -## Example: Integrate Docker Model Runner into your software development lifecycle +## Integrate the Docker Model Runner into your software development lifecycle You can now start building your Generative AI application powered by the Docker Model Runner. @@ -218,6 +164,7 @@ with `/exp/vDD4.40`. > [!NOTE] > You can omit `llama.cpp` from the path. For example: `POST /engines/v1/chat/completions`. + ### How do I interact through the OpenAI API? #### From within a container @@ -333,3 +280,12 @@ The Docker Model CLI currently lacks consistent support for specifying models by ## Share feedback Thanks for trying out Docker Model Runner. Give feedback or report any bugs you may find through the **Give feedback** link next to the **Enable Docker Model Runner** setting. + +## Disable the feature + +To disable Docker Model Runner: + +1. Open the **Settings** view in Docker Desktop. +2. Navigate to the **Beta** tab in **Features in development**. +3. Clear the **Enable Docker Model Runner** checkbox. +4. Select **Apply & restart**. diff --git a/data/redirects.yml b/data/redirects.yml index 2fa714d311e1..aed83e6b2667 100644 --- a/data/redirects.yml +++ b/data/redirects.yml @@ -284,8 +284,7 @@ - /go/mcp-toolkit/ # Desktop DMR - -"/ai/model-runner/": +"/model-runner/": - /go/model-runner/ # Docker Desktop - volumes cloud backup @@ -339,3 +338,4 @@ - /go/permissions/ "/desktop/setup/install/mac-permission-requirements/#binding-privileged-ports": - /go/port-mapping/ + \ No newline at end of file From df4130507bc587b8fe279368507c79fbf85ff1df Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 5 Jun 2025 09:58:21 +0200 Subject: [PATCH 7/8] DMR: GUI docs (#22781) Reverts docker/docs#22780 --- content/manuals/_index.md | 2 +- .../_index.md} | 82 ++++++++++++++----- data/redirects.yml | 4 +- 3 files changed, 66 insertions(+), 22 deletions(-) rename content/manuals/ai/{model-runner.md => model-runner/_index.md} (83%) diff --git a/content/manuals/_index.md b/content/manuals/_index.md index f90b12bc4887..43eb7dc6cebb 100644 --- a/content/manuals/_index.md +++ b/content/manuals/_index.md @@ -39,7 +39,7 @@ params: - title: Docker Model Runner description: View and manage your local models. icon: view_in_ar - link: /model-runner/ + link: /ai/model-runner/ - title: MCP Catalog and Toolkit description: Augment your AI workflow with MCP servers. icon: /icons/toolkit.svg diff --git a/content/manuals/ai/model-runner.md b/content/manuals/ai/model-runner/_index.md similarity index 83% rename from content/manuals/ai/model-runner.md rename to content/manuals/ai/model-runner/_index.md index 279336575d95..56dc11dcae8c 100644 --- a/content/manuals/ai/model-runner.md +++ b/content/manuals/ai/model-runner/_index.md @@ -11,24 +11,27 @@ description: Learn how to use Docker Model Runner to manage and run AI models. keywords: Docker, ai, model runner, docker desktop, docker engine, llm aliases: - /desktop/features/model-runner/ - - /ai/model-runner/ + - /model-runner/ --- {{< summary-bar feature_name="Docker Model Runner" >}} -The Docker Model Runner plugin lets you: +## Key features -- [Pull models from Docker Hub](https://hub.docker.com/u/ai) -- Run AI models directly from the command line -- Manage local models (add, list, remove) -- Interact with models using a submitted prompt or in chat mode in the CLI or Docker Desktop Dashboard -- Push models to Docker Hub +- [Pull and push models to and from Docker Hub](https://hub.docker.com/u/ai) +- Run and interact with AI models directly from the command line or from the Docker Desktop GUI +- Manage local models and display logs + +## How it works Models are pulled from Docker Hub the first time they're used and stored locally. They're loaded into memory only at runtime when a request is made, and unloaded when not in use to optimize resources. Since models can be large, the initial pull may take some time — but after that, they're cached locally for faster access. You can interact with the model using [OpenAI-compatible APIs](#what-api-endpoints-are-available). > [!TIP] > -> Using Testcontainers or Docker Compose? [Testcontainers for Java](https://java.testcontainers.org/modules/docker_model_runner/) and [Go](https://golang.testcontainers.org/modules/dockermodelrunner/), and [Docker Compose](/manuals/compose/how-tos/model-runner.md) now support Docker Model Runner. +> Using Testcontainers or Docker Compose? +> [Testcontainers for Java](https://java.testcontainers.org/modules/docker_model_runner/) +> and [Go](https://golang.testcontainers.org/modules/dockermodelrunner/), and +> [Docker Compose](/manuals/compose/how-tos/model-runner.md) now support Docker Model Runner. ## Enable Docker Model Runner @@ -76,7 +79,58 @@ You can now use the `docker model` command in the CLI and view and interact with $ docker model run ai/smollm2 ``` -## Integrate the Docker Model Runner into your software development lifecycle +## Pull a model + +Models are cached locally. + +{{< tabs >}} +{{< tab name="From Docker Desktop">}} + +1. Select **Models** and select the **Docker Hub** tab. +2. Find the model of your choice and select **Pull**. + +{{< /tab >}} +{{< tab name="From the Docker CLI">}} + +Use the [`docker model pull` command](/reference/cli/docker/). + +{{< /tab >}} +{{< /tabs >}} + +## Run a model + +{{< tabs >}} +{{< tab name="From Docker Desktop">}} + +Select **Models** and select the **Local** tab and click the play button. +The interactive chat screen opens. + +{{< /tab >}} +{{< tab name="From the Docker CLI">}} + +Use the [`docker model run` command](/reference/cli/docker/). + +{{< /tab >}} +{{< /tabs >}} + +## Troubleshooting + +To troubleshoot potential issues, display the logs: + +{{< tabs >}} +{{< tab name="From Docker Desktop">}} + +Select **Models** and select the **Logs** tab. + +{{< /tab >}} +{{< tab name="From the Docker CLI">}} + +Use the [`docker model log` command](/reference/cli/docker/). + +{{< /tab >}} +{{< /tabs >}} + +## Example: Integrate Docker Model Runner into your software development lifecycle You can now start building your Generative AI application powered by the Docker Model Runner. @@ -164,7 +218,6 @@ with `/exp/vDD4.40`. > [!NOTE] > You can omit `llama.cpp` from the path. For example: `POST /engines/v1/chat/completions`. - ### How do I interact through the OpenAI API? #### From within a container @@ -280,12 +333,3 @@ The Docker Model CLI currently lacks consistent support for specifying models by ## Share feedback Thanks for trying out Docker Model Runner. Give feedback or report any bugs you may find through the **Give feedback** link next to the **Enable Docker Model Runner** setting. - -## Disable the feature - -To disable Docker Model Runner: - -1. Open the **Settings** view in Docker Desktop. -2. Navigate to the **Beta** tab in **Features in development**. -3. Clear the **Enable Docker Model Runner** checkbox. -4. Select **Apply & restart**. diff --git a/data/redirects.yml b/data/redirects.yml index aed83e6b2667..2fa714d311e1 100644 --- a/data/redirects.yml +++ b/data/redirects.yml @@ -284,7 +284,8 @@ - /go/mcp-toolkit/ # Desktop DMR -"/model-runner/": + +"/ai/model-runner/": - /go/model-runner/ # Docker Desktop - volumes cloud backup @@ -338,4 +339,3 @@ - /go/permissions/ "/desktop/setup/install/mac-permission-requirements/#binding-privileged-ports": - /go/port-mapping/ - \ No newline at end of file From 1183130eb19eda128446734e36d580fd7c8663b0 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 5 Jun 2025 09:56:28 +0100 Subject: [PATCH 8/8] ENGDOCS-2696b (#22784) ## Description Redo https://github.com/docker/docs/pull/22773 ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/ai/gordon/_index.md | 17 ++++++-------- content/manuals/ai/model-runner/_index.md | 15 ++++++------- .../settings-and-maintenance/settings.md | 22 +++++++------------ .../configure-json-file.md | 17 +++++++------- .../settings-management/settings-reference.md | 12 ++++++---- data/summary.yaml | 2 +- 6 files changed, 40 insertions(+), 45 deletions(-) diff --git a/content/manuals/ai/gordon/_index.md b/content/manuals/ai/gordon/_index.md index 6cd19cd555be..83b1faf5fd56 100644 --- a/content/manuals/ai/gordon/_index.md +++ b/content/manuals/ai/gordon/_index.md @@ -86,21 +86,18 @@ If you have concerns about data collection or usage, you can ## Enable Ask Gordon 1. Sign in to your Docker account. -2. Navigate to the **Features in development** tab in settings. -3. Under the **Experimental features** tab, select **Access experimental features**. -4. Select **Apply and restart**. -5. Quit and reopen Docker Desktop to ensure the changes take effect. -6. Open the **Settings** view in Docker Desktop. -7. Navigate to **Features in development**. -8. From the **Beta** tab, check the **Enable Docker AI** checkbox. +2. Navigate to the **Beta features** tab in settings. +3. Check the **Enable Docker AI** checkbox. The Docker AI terms of service agreement is displayed. You must agree to the terms before you can enable the feature. Review the terms and select **Accept and enable** to continue. -9. Select **Apply & restart**. +4. Select **Apply & restart**. -You can also enable Ask Gordon from the **Ask Gordon** tab if you have selected the **Access experimental features** setting. Simply select the **Enable Ask Gordon** button, and then accept the Docker AI terms of service agreement. +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page. ## Using Ask Gordon @@ -204,7 +201,7 @@ across several dimensions: If you've enabled Ask Gordon and you want to disable it again: 1. Open the **Settings** view in Docker Desktop. -2. Navigate to **Features in development**. +2. Navigate to **Beta features**. 3. Clear the **Enable Docker AI** checkbox. 4. Select **Apply & restart**. diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md index 56dc11dcae8c..3b6473fd185e 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner/_index.md @@ -37,17 +37,16 @@ Models are pulled from Docker Hub the first time they're used and stored locally ### Enable DMR in Docker Desktop -1. Navigate to the **Features in development** tab in settings. -2. Under the **Experimental features** tab, select **Access experimental features**. -3. Select **Apply and restart**. -4. Quit and reopen Docker Desktop to ensure the changes take effect. -5. Open the **Settings** view in Docker Desktop. -6. Navigate to **Features in development**. -7. From the **Beta** tab, tick the **Enable Docker Model Runner** setting. -8. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting. +1. Navigate to the **Beta features** tab in settings. +2. Tick the **Enable Docker Model Runner** setting. +3. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting. You can now use the `docker model` command in the CLI and view and interact with your local models in the **Models** tab in the Docker Desktop Dashboard. +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page. + ### Enable DMR in Docker Engine 1. Ensure you have installed [Docker Engine](/engine/install/). diff --git a/content/manuals/desktop/settings-and-maintenance/settings.md b/content/manuals/desktop/settings-and-maintenance/settings.md index ab4cb2d88467..d43c9d1cc4ef 100644 --- a/content/manuals/desktop/settings-and-maintenance/settings.md +++ b/content/manuals/desktop/settings-and-maintenance/settings.md @@ -472,13 +472,7 @@ Use the **Extensions** tab to: For more information about Docker extensions, see [Extensions](/manuals/extensions/_index.md). -## Features in development - -On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**. - -You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Features in development** tab. - -### Beta features +## Beta features Beta features provide access to future product functionality. These features are intended for testing and feedback only as they may change @@ -486,16 +480,16 @@ between releases without warning or remove them entirely from a future release. Beta features must not be used in production environments. Docker doesn't offer support for beta features. -### Experimental features - -Experimental features provide early access to future product functionality. -These features are intended for testing and feedback only as they may change -between releases without warning or can be removed entirely from a future -release. Experimental features must not be used in production environments. -Docker does not offer support for experimental features. +You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Beta features** tab. For a list of current experimental features in the Docker CLI, see [Docker CLI Experimental features](https://github.com/docker/cli/blob/master/experimental/README.md). +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, there is also an **Experimental features** tab under the **Features in development** page. +> +> As with beta features, experimental features must not be used in production environments. Docker does not offer support for experimental features. + ## Notifications Use the **Notifications** tab to turn on or turn off notifications for the following events: 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 3f379f82308b..fd649b574918 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 @@ -165,10 +165,6 @@ of configurable settings for the `admin-settings.json` file, see [`admin-setting "sbomIndexing": true, "useBackgroundIndexing": true }, - "allowExperimentalFeatures": { - "locked": false, - "value": false - }, "allowBetaFeatures": { "locked": false, "value": false @@ -310,14 +306,19 @@ quit and reopened. For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows). -### Features in development +### Beta features + +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, some of these settings lived under the **Experimental features** tab on the **Features in development** page. | Parameter | OS | Description | Version | |:----------------------------|----|:--------------------------------------------------------------------------------------------------------------------------------------------------------------|---------| -| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | | | `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). | | -| `enableDockerMCPToolkit` | | If `allowBetaFeatures` is true, setting `enableDockerMCPToolkit` to `true` enables the [MCP toolkit feature](/manuals/ai/mcp-catalog-and-toolkit/toolkit.md). | | +| `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. | | +| `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 | ### Enhanced Container Isolation diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md index 5a44a0e0fe43..483f62964320 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md @@ -763,7 +763,11 @@ third-party or unvetted plugins from being installed. - **Configure this setting with:** - **Extensions** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) -## Features in development +## Beta features + +> [!IMPORTANT] +> +> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page. ### Enable Docker AI @@ -775,7 +779,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable AI features like "Ask Gordon". - **Configure this setting with:** - - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md) ### Enable Docker Model Runner @@ -788,7 +792,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable Docker Model Runner features. - **Configure this setting with:** - - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) ### Enable host-side TCP support @@ -800,7 +804,7 @@ third-party or unvetted plugins from being installed. - **OS:** {{< badge color=blue text="All" >}} - **Use case:** Enable or disable Docker Model Runner features. - **Configure this setting with:** - - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) > [!NOTE] > diff --git a/data/summary.yaml b/data/summary.yaml index 5d1410492f5a..0854d1d5549d 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -70,7 +70,7 @@ Compliance reporting: Compose attach: requires: Docker Compose [2.20.0](/manuals/compose/releases/release-notes.md#2200) and later Compose bridge: - availability: Experimental + availability: Beta Config profiles: requires: Docker Desktop 4.36 and later Compose dependent images: