From f60a4283a7d9fdb9809c581c4937be315c827a09 Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 5 Jun 2025 11:12:35 +0200 Subject: [PATCH 1/3] ux: touch up tabs (#22783) --- .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 98f293055c8084b8ba71741ca9a178543f9a26c2 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Thu, 5 Jun 2025 13:15:08 +0100 Subject: [PATCH 2/3] desktop: beta settings --- .../configure-json-file.md | 1 + .../settings-management/settings-reference.md | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) 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 fd649b574918..1b62e8b6af15 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 @@ -317,6 +317,7 @@ 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. | | | `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/security/for-admins/hardened-desktop/settings-management/settings-reference.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md index 483f62964320..0d3403a89623 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 @@ -793,6 +793,7 @@ third-party or unvetted plugins from being installed. - **Use case:** Enable or disable Docker Model Runner features. - **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/security/for-admins/hardened-desktop/settings-management/configure-json-file.md) ### Enable host-side TCP support @@ -805,11 +806,48 @@ third-party or unvetted plugins from being installed. - **Use case:** Enable or disable Docker Model Runner features. - **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/security/for-admins/hardened-desktop/settings-management/configure-json-file.md) + > [!NOTE] > > This setting requires Docker Model Runner setting to be enabled first. +### Enable Docker MCP Toolkit + +| Default value | Accepted values | Format | +|---------------|-----------------|----------| +| `true` | `true`, `false` | Boolean | + +- **Description:** Enable [Docker MCP Toolkit](/manuals/ai/mcp-catalog-and-toolkit/_index.md) in Docker Desktop. +- **OS:** {{< badge color=blue text="All" >}} +- **Configure this setting with:** + - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + - Settings Management: `enableDockerMCPToolkit` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md) + + +### Enable Wasm + +| Default value | Accepted values | Format | +|---------------|-----------------|----------| +| `true` | `true`, `false` | Boolean | + +- **Description:** Enable [Wasm](/manuals/desktop/features/wasm.md) to run Wasm workloads. +- **OS:** {{< badge color=blue text="All" >}} +- **Configure this setting with:** + - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + +### Enable Compose Bridge + +| Default value | Accepted values | Format | +|---------------|-----------------|----------| +| `true` | `true`, `false` | Boolean | + +- **Description:** Enable [Compose Bridge](/manuals/compose/bridge/_index.md). +- **OS:** {{< badge color=blue text="All" >}} +- **Configure this setting with:** + - **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md) + ## Notifications ### Status updates on tasks and processes From a2b9f22e3393603a37a806a7e9f23eba6f1675f8 Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 5 Jun 2025 14:23:24 +0200 Subject: [PATCH 3/3] fix: wording (#22789) --- content/manuals/ai/model-runner/_index.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md index 5d9b647dbfd4..b3d248d2b97a 100644 --- a/content/manuals/ai/model-runner/_index.md +++ b/content/manuals/ai/model-runner/_index.md @@ -319,11 +319,16 @@ To fix this, create a symlink so Docker can detect it: $ ln -s /Applications/Docker.app/Contents/Resources/cli-plugins/docker-model ~/.docker/cli-plugins/docker-model ``` -Once linked, re-run the command. +Once linked, rerun the command. ### No safeguard for running oversized models -Currently, Docker Model Runner doesn't include safeguards to prevent you from launching models that exceed their system's available resources. Attempting to run a model that is too large for the host machine may result in severe slowdowns or render the system temporarily unusable. This issue is particularly common when running LLMs models without sufficient GPU memory or system RAM. +Currently, Docker Model Runner doesn't include safeguards to prevent you from +launching models that exceed your system's available resources. Attempting to +run a model that is too large for the host machine may result in severe +slowdowns or may render the system temporarily unusable. This issue is +particularly common when running LLMs without sufficient GPU memory or system +RAM. ### No consistent digest support in Model CLI