Skip to content

Commit 4ee967f

Browse files
aevesdockeraevesdocker
authored
Merge pull request #22786 from docker/published-update
publish updates from main
2 parents 57c41af + 659c547 commit 4ee967f

File tree

6 files changed

+70
-15
lines changed

6 files changed

+70
-15
lines changed

‎.vscode/docker.code-snippets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"prefix": ["admonition", "tabs"],
2424
"body": [
2525
"",
26-
"{{< tabs >}}",
27-
"{{< tab name=\"$1\">}}",
26+
"{{< tabs group=\"$1\" >}}",
27+
"{{< tab name=\"$2\">}}",
2828
"",
29-
"$2",
29+
"$3",
3030
"",
3131
"{{< /tab >}}",
32-
"{{< tab name=\"$3\">}}",
32+
"{{< tab name=\"$4\">}}",
3333
"",
34-
"$4",
34+
"$5",
3535
"",
3636
"{{< /tab >}}",
3737
"{{</tabs >}}",

‎assets/css/components.css‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,15 @@
101101
.summary-bar {
102102
@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;
103103
}
104+
105+
.tabs {
106+
@apply bg-blue/2 rounded-sm p-2;
107+
}
108+
.tablist {
109+
@apply mb-1 border-b border-gray-100 dark:border-gray-800;
110+
}
111+
112+
.tab-item {
113+
@apply inline-block rounded-sm px-3 py-2 hover:bg-gray-100 dark:hover:bg-gray-900;
114+
@apply dark:text-gray-200;
115+
}

‎content/manuals/ai/model-runner/_index.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ You can now use the `docker model` command in the CLI and view and interact with
8383

8484
Models are cached locally.
8585

86-
{{< tabs >}}
86+
{{< tabs group="release" >}}
8787
{{< tab name="From Docker Desktop">}}
8888

8989
1. Select **Models** and select the **Docker Hub** tab.
@@ -99,14 +99,14 @@ Use the [`docker model pull` command](/reference/cli/docker/).
9999

100100
## Run a model
101101

102-
{{< tabs >}}
102+
{{< tabs group="release" >}}
103103
{{< tab name="From Docker Desktop">}}
104104

105105
Select **Models** and select the **Local** tab and click the play button.
106106
The interactive chat screen opens.
107107

108108
{{< /tab >}}
109-
{{< tab name="From the Docker CLI">}}
109+
{{< tab name="From the Docker CLI" >}}
110110

111111
Use the [`docker model run` command](/reference/cli/docker/).
112112

@@ -117,7 +117,7 @@ Use the [`docker model run` command](/reference/cli/docker/).
117117

118118
To troubleshoot potential issues, display the logs:
119119

120-
{{< tabs >}}
120+
{{< tabs group="release" >}}
121121
{{< tab name="From Docker Desktop">}}
122122

123123
Select **Models** and select the **Logs** tab.
@@ -320,11 +320,16 @@ To fix this, create a symlink so Docker can detect it:
320320
$ ln -s /Applications/Docker.app/Contents/Resources/cli-plugins/docker-model ~/.docker/cli-plugins/docker-model
321321
```
322322
323-
Once linked, re-run the command.
323+
Once linked, rerun the command.
324324
325325
### No safeguard for running oversized models
326326
327-
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.
327+
Currently, Docker Model Runner doesn't include safeguards to prevent you from
328+
launching models that exceed your system's available resources. Attempting to
329+
run a model that is too large for the host machine may result in severe
330+
slowdowns or may render the system temporarily unusable. This issue is
331+
particularly common when running LLMs without sufficient GPU memory or system
332+
RAM.
328333
329334
### No consistent digest support in Model CLI
330335

‎content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ For more information, see [Networking](/manuals/desktop/features/networking.md#n
317317
| `allowBetaFeatures` | | If `value` is set to `true`, beta features are enabled. | |
318318
| `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. | |
319319
| `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. | |
320+
| &nbsp; &nbsp; &nbsp; &nbsp; `enableInferenceTCP` | | Enable host-side TCP support. This setting requires Docker Model Runner setting to be enabled first. | |
320321
| `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. | |
321322
| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | Docker Desktop version 4.41 and earlier |
322323

‎content/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,7 @@ third-party or unvetted plugins from being installed.
793793
- **Use case:** Enable or disable Docker Model Runner features.
794794
- **Configure this setting with:**
795795
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
796+
- Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
796797

797798
### Enable host-side TCP support
798799

@@ -805,11 +806,48 @@ third-party or unvetted plugins from being installed.
805806
- **Use case:** Enable or disable Docker Model Runner features.
806807
- **Configure this setting with:**
807808
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
809+
- Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
810+
808811

809812
> [!NOTE]
810813
>
811814
> This setting requires Docker Model Runner setting to be enabled first.
812815
816+
### Enable Docker MCP Toolkit
817+
818+
| Default value | Accepted values | Format |
819+
|---------------|-----------------|----------|
820+
| `true` | `true`, `false` | Boolean |
821+
822+
- **Description:** Enable [Docker MCP Toolkit](/manuals/ai/mcp-catalog-and-toolkit/_index.md) in Docker Desktop.
823+
- **OS:** {{< badge color=blue text="All" >}}
824+
- **Configure this setting with:**
825+
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
826+
- Settings Management: `enableDockerMCPToolkit` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
827+
828+
829+
### Enable Wasm
830+
831+
| Default value | Accepted values | Format |
832+
|---------------|-----------------|----------|
833+
| `true` | `true`, `false` | Boolean |
834+
835+
- **Description:** Enable [Wasm](/manuals/desktop/features/wasm.md) to run Wasm workloads.
836+
- **OS:** {{< badge color=blue text="All" >}}
837+
- **Configure this setting with:**
838+
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
839+
840+
### Enable Compose Bridge
841+
842+
| Default value | Accepted values | Format |
843+
|---------------|-----------------|----------|
844+
| `true` | `true`, `false` | Boolean |
845+
846+
- **Description:** Enable [Compose Bridge](/manuals/compose/bridge/_index.md).
847+
- **OS:** {{< badge color=blue text="All" >}}
848+
- **Configure this setting with:**
849+
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
850+
813851
## Notifications
814852

815853
### Status updates on tasks and processes

‎layouts/shortcodes/tabs.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77

88
<div
9+
class="tabs"
910
{{ with $group }}
1011
{{ if $persist }}
1112
x-data="{ selected: $persist('{{ $first }}').as('{{ $groupID }}') }"
@@ -19,10 +20,10 @@
1920
{{ end }}
2021
aria-role="tabpanel"
2122
>
22-
<div aria-role="tablist" class="space-x-2">
23+
<div aria-role="tablist" class="tablist">
2324
{{ range (.Store.Get "tabs") }}
2425
<button
25-
class="p-1"
26+
class="tab-item"
2627
:class="selected === '{{ .name | urlize }}' &&
2728
'border-blue border-b-4 dark:border-b-blue-600'"
2829
{{ if $group }}
@@ -36,7 +37,6 @@
3637
</button>
3738
{{ end }}
3839
</div>
39-
<hr class="!mt-0" />
4040
<div>
4141
{{ range (.Store.Get "tabs") }}
4242
<div
@@ -47,5 +47,4 @@
4747
</div>
4848
{{ end }}
4949
</div>
50-
<hr />
5150
</div>

0 commit comments

Comments
 (0)