Merge pull request #22719 from docker/published-update

publish updates from main

Author: craig-osterhout

.vscode/docker.code-snippets

@@ -39,4 +39,9 @@
     ],
     "description": "Insert a Hugo tabs block with two tabs and snippet stops for names and content",
   },
+  "Insert a Button": {
+    "prefix": ["button"],
+    "body": ["{{< button url=\"$1\" text=\"$2\" >}}"],
+    "description": "Insert a Hugo button",
+  },
 }

_vendor/modules.txt

@@ -1,6 +1,6 @@
-# github.com/moby/moby v28.2.0+incompatible
+# github.com/moby/moby v28.2.1+incompatible
 # github.com/moby/buildkit v0.22.0
 # github.com/docker/buildx v0.24.0
-# github.com/docker/cli v28.2.0+incompatible
+# github.com/docker/cli v28.2.1+incompatible
 # github.com/docker/compose/v2 v2.36.2
 # github.com/docker/scout-cli v1.15.0

assets/css/components.css

@@ -94,6 +94,9 @@
     @apply h-12 w-12 overflow-hidden;
   }
 }
+.button {
+  @apply mt-1 inline-block rounded-sm bg-blue-500 p-1 px-3 text-blue-50 text-white hover:bg-blue-600 dark:bg-blue-500 hover:dark:bg-blue-400;
+}
 
 .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;

assets/css/global.css

@@ -104,3 +104,6 @@ input[type="search"]::-ms-clear {
     list-style-type: lower-roman;
   }
 }
+.navbar-group:first-of-type {
+  margin-top: 0.2rem !important;
+}

assets/css/utilities.css

@@ -118,9 +118,20 @@
   }
 }
 
+@utility navbar-entry-margin {
+  @apply px-2 py-1;
+}
+
+@utility navbar-group {
+  @apply mt-5;
+}
+
+@utility navbar-entry-background-current {
+  @apply bg-gray-100 dark:bg-gray-900;
+}
 @utility navbar-group-font-title {
   font-size: var(--color-navbar-group-font-title-size);
-  @apply font-semibold uppercase;
+  @apply pb-1.5 font-semibold uppercase;
   color: var(--color-navbar-text);
   .dark & {
     color: var(--color-navbar-text-dark);
@@ -240,3 +251,6 @@
     }
   }
 }
+@utility chip {
+  @apply border-divider-light dark:border-divider-dark inline-flex items-center gap-1 rounded-full border bg-gray-100 px-2 text-sm text-gray-800 select-none dark:bg-gray-700 dark:text-gray-200;
+}

content/get-started/introduction/get-docker-desktop.md

@@ -26,6 +26,7 @@ This guide will walk you through the installation process, enabling you to exper
 > Commercial use of Docker Desktop in larger enterprises (more than 250
 > employees OR more than $10 million USD in annual revenue) requires a [paid subscription](https://www.docker.com/pricing/?_gl=1*1nyypal*_ga*MTYxMTUxMzkzOS4xNjgzNTM0MTcw*_ga_XJWPQMJYHQ*MTcxNjk4MzU4Mi4xMjE2LjEuMTcxNjk4MzkzNS4xNy4wLjA.).
 
+<div class="not-prose">
 {{< card
   title="Docker Desktop for Mac"
   description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/setup/install/mac-install)"
@@ -40,7 +41,7 @@ This guide will walk you through the installation process, enabling you to exper
   title="Docker Desktop for Linux"
   description="[Install instructions](/desktop/setup/install/linux/)"
   icon="/icons/Linux.svg" >}}
-
+</div>
 
 Once it's installed, complete the setup process and you're all set to run a Docker container.
 

content/get-started/resources.md

@@ -9,7 +9,7 @@ Docker and the broader community of Docker experts have put together many differ
 
 ## Docker Training
 
-Expand your knowledge on all things Docker with [basic to advanced trainings from Docker experts](https://www.docker.com/resources/trainings/). 
+Expand your knowledge on all things Docker with [basic to advanced trainings from Docker experts](https://www.docker.com/trainings/). 
 
 You can find recorded content at your own convenience, or register for a live session to participate in Q&A.
 

content/manuals/ai/model-runner.md

@@ -40,19 +40,11 @@ Models are pulled from Docker Hub the first time they're used and stored locally
 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, check the **Enable Docker Model Runner** setting.
+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.
 
-### Enable DMR in Docker Engine
-
-1. Ensure you have installed [Docker Engine](/engine/install/).
-2. DMR is available as a package. To install it, run:
-
-   ```console
-   apt install docker-model-plugin
-   ```
-
 ## Available commands
 
 ### Model runner status

content/manuals/desktop/features/wsl/_index.md

@@ -23,7 +23,7 @@ Additionally, with WSL 2, the time required to start a Docker daemon after a col
 
 Before you turn on the Docker Desktop WSL 2 feature, ensure you have:
 
-- At a minimum WSL version 1.1.3.0., but ideally the latest version of WSL to [avoid Docker Desktop not working as expected](best-practices.md).
+- At a minimum WSL version 2.1.5, but ideally the latest version of WSL to [avoid Docker Desktop not working as expected](best-practices.md).
 - Met the Docker Desktop for Windows' [system requirements](/manuals/desktop/setup/install/windows-install.md#system-requirements).
 - Installed the WSL 2 feature on Windows. For detailed instructions, refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
 

content/manuals/desktop/features/wsl/best-practices.md

@@ -7,7 +7,7 @@ aliases:
 - /desktop/wsl/best-practices/
 ---
 
-- Always use the latest version of WSL. At a minimum you must use WSL version 1.1.3.0., otherwise Docker Desktop may not work as expected. Testing, development, and documentation is based on the newest kernel versions. Older versions of WSL can cause:
+- Always use the latest version of WSL. At a minimum you must use WSL version 2.1.5, otherwise Docker Desktop may not work as expected. Testing, development, and documentation is based on the newest kernel versions. Older versions of WSL can cause:
     - Docker Desktop to hang periodically or when upgrading
     - Deployment via SCCM to fail
     - The `vmmem.exe` to consume all memory