From cd5757d65a2f7c101f2e9e0295c83f8e04849e64 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 4 Jun 2025 10:42:44 +0200 Subject: [PATCH 1/3] DMR: add Docker CE base urls (#22760) Co-authored-by: Kevin Wittek --- content/manuals/ai/model-runner.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/content/manuals/ai/model-runner.md b/content/manuals/ai/model-runner.md index a9d11ee1008e..279336575d95 100644 --- a/content/manuals/ai/model-runner.md +++ b/content/manuals/ai/model-runner.md @@ -112,8 +112,32 @@ See [the reference docs](/reference/cli/docker/model/). Once the feature is enabled, new API endpoints are available under the following base URLs: +{{< tabs >}} +{{< tab name="Docker Desktop">}} + - From containers: `http://model-runner.docker.internal/` -- From host processes: `http://localhost:12434/`, assuming you have enabled TCP host access on default port 12434. +- From host processes: `http://localhost:12434/`, assuming TCP host access is + enabled on the default port (12434). + +{{< /tab >}} +{{< tab name="Docker Engine">}} + +- From containers: `http://172.17.0.1:12434/` (with `172.17.0.1` representing the host gateway address) +- From host processes: `http://localhost:12434/` + +> [!NOTE] +> The `172.17.0.1` interface may not be available by default to containers + within a Compose project. +> In this case, add an `extra_hosts` directive to your Compose service YAML: +> +> ```yaml +> extra_hosts: +> - "model-runner.docker.internal:host-gateway" +> ``` +> Then you can access the Docker Model Runner APIs at http://model-runner.docker.internal:12434/ + +{{< /tab >}} +{{}} Docker Model management endpoints: From b3341720ff84dfd6043fc3241b3d9ac09631fe7f Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 4 Jun 2025 10:43:42 +0200 Subject: [PATCH 2/3] fix: incorrect redirection (#22762) --- data/redirects.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/redirects.yml b/data/redirects.yml index 37bd3876b5ff..0e4cac686d1f 100644 --- a/data/redirects.yml +++ b/data/redirects.yml @@ -302,5 +302,5 @@ - /go/model-runner/ # Desktop MCP Toolkit -"/ai/mcp-toolkit/": +"/ai/mcp-catalog-and-toolkit/toolkit/": - /go/mcp-toolkit/ From d8640994dc44b29ac7d3e5206d895d7ebc4180f9 Mon Sep 17 00:00:00 2001 From: karman <110832017+karman-docker@users.noreply.github.com> Date: Wed, 4 Jun 2025 09:29:00 +0000 Subject: [PATCH 3/3] update wsl minimum version (#22764) ## Description In line with this change https://github.com/docker/docs/pull/22721, updating other references to the older version of WSL. ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/setup/install/windows-install.md | 4 ++-- .../enhanced-container-isolation/limitations.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/manuals/desktop/setup/install/windows-install.md b/content/manuals/desktop/setup/install/windows-install.md index 1bb4e86bb2ec..26e6c255bda6 100644 --- a/content/manuals/desktop/setup/install/windows-install.md +++ b/content/manuals/desktop/setup/install/windows-install.md @@ -47,7 +47,7 @@ _For checksums, see [Release notes](/manuals/desktop/release-notes.md)_ {{< tabs >}} {{< tab name="WSL 2 backend, x86_64" >}} -- WSL version 1.1.3.0 or later. +- WSL version 2.1.5 or later. - Windows 11 64-bit: Home or Pro version 22H2 or higher, or Enterprise or Education version 22H2 or higher. - Windows 10 64-bit: Minimum required is Home or Pro 22H2 (build 19045) or higher, or Enterprise or Education 22H2 (build 19045) or higher. - Turn on the WSL 2 feature on Windows. For detailed instructions, refer to the @@ -97,7 +97,7 @@ For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals {{< /tab >}} {{< tab name="WSL 2 backend, Arm (Early Access)" >}} -- WSL version 1.1.3.0 or later. +- WSL version 2.1.5 or later. - Windows 11 64-bit: Home or Pro version 22H2 or higher, or Enterprise or Education version 22H2 or higher. - Windows 10 64-bit: Minimum required is Home or Pro 22H2 (build 19045) or higher, or Enterprise or Education 22H2 (build 19045) or higher. - Turn on the WSL 2 feature on Windows. For detailed instructions, refer to the diff --git a/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/limitations.md b/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/limitations.md index 758e5389701d..b0dc419e4879 100644 --- a/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/limitations.md +++ b/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/limitations.md @@ -10,9 +10,9 @@ weight: 50 > [!NOTE] > -> Docker Desktop requires WSL 2 version 1.1.3.0 or later. To get the current +> Docker Desktop requires WSL 2 version 2.1.5 or later. To get the current > version of WSL on your host, type `wsl --version`. If the command fails or if -> it returns a version number prior to 1.1.3.0, update WSL to the latest version +> it returns a version number prior to 2.1.5, update WSL to the latest version > by typing `wsl --update` in a Windows command or PowerShell terminal. ECI on WSL is not as secure as on Hyper-V because: