diff --git a/.vscode/docker.code-snippets b/.vscode/docker.code-snippets index 200264824d67..18fde97b1548 100644 --- a/.vscode/docker.code-snippets +++ b/.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", + }, } diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 40a3c2f18774..66af6e750448 100644 --- a/_vendor/modules.txt +++ b/_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 diff --git a/assets/css/components.css b/assets/css/components.css index c77f6ec01a45..bfb1ef702cdb 100644 --- a/assets/css/components.css +++ b/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; diff --git a/assets/css/global.css b/assets/css/global.css index e1d27a0b3227..bd7d62c1cbff 100644 --- a/assets/css/global.css +++ b/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; +} diff --git a/assets/css/utilities.css b/assets/css/utilities.css index 5bd521f8f195..99471943da6d 100644 --- a/assets/css/utilities.css +++ b/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; +} diff --git a/content/get-started/introduction/get-docker-desktop.md b/content/get-started/introduction/get-docker-desktop.md index 7bb25be36e60..5b6ff9d5e088 100644 --- a/content/get-started/introduction/get-docker-desktop.md +++ b/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.). +
{{< 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" >}} - +
Once it's installed, complete the setup process and you're all set to run a Docker container. diff --git a/content/get-started/resources.md b/content/get-started/resources.md index 985458384d69..133d27ecbef7 100644 --- a/content/get-started/resources.md +++ b/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. diff --git a/content/manuals/ai/model-runner.md b/content/manuals/ai/model-runner.md index 7ef5f376793b..e606d716fee0 100644 --- a/content/manuals/ai/model-runner.md +++ b/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 diff --git a/content/manuals/desktop/features/wsl/_index.md b/content/manuals/desktop/features/wsl/_index.md index bba84c34e9e0..31c88fc5a082 100644 --- a/content/manuals/desktop/features/wsl/_index.md +++ b/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). diff --git a/content/manuals/desktop/features/wsl/best-practices.md b/content/manuals/desktop/features/wsl/best-practices.md index 393604b2cede..9645f0ac533e 100644 --- a/content/manuals/desktop/features/wsl/best-practices.md +++ b/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 diff --git a/content/manuals/engine/release-notes/28.md b/content/manuals/engine/release-notes/28.md index 60cbd60e1318..c8eebc5537cb 100644 --- a/content/manuals/engine/release-notes/28.md +++ b/content/manuals/engine/release-notes/28.md @@ -23,6 +23,14 @@ For more information about: - Deprecated and removed features, see [Deprecated Engine Features](../deprecated.md). - Changes to the Engine API, see [Engine API version history](/reference/api/engine/version-history.md). +## 28.2.1 + +{{< release-date date="2025-05-29" >}} + +## Packaging updates + +- Fix packaging regression in [v28.2.0](https://github.com/moby/moby/releases/tag/v28.2.0) which broke creating the `docker` group/user on fresh installations. [docker-ce-packaging#1209](https://github.com/docker/docker-ce-packaging/issues/1209) + ## 28.2.0 {{< release-date date="2025-05-28" >}} diff --git a/content/reference/api/engine/_index.md b/content/reference/api/engine/_index.md index 13ae6dbec608..21f9e79a9c77 100644 --- a/content/reference/api/engine/_index.md +++ b/content/reference/api/engine/_index.md @@ -73,21 +73,21 @@ To see the highest version of the API your Docker daemon and client support, use ```console $ docker version Client: Docker Engine - Community - Version: 28.2.0 + Version: 28.2.1 API version: 1.50 Go version: go1.24.3 Git commit: 879ac3f - Built: Wed May 28 13:30:50 2025 + Built: Wed May 28 19:24:55 2025 OS/Arch: linux/arm64 Context: default Server: Docker Engine - Community Engine: - Version: 28.2.0 + Version: 28.2.1 API version: 1.50 (minimum version 1.24) Go version: go1.24.3 Git commit: 0e2cc22 - Built: Wed May 28 13:30:50 2025 + Built: Wed May 28 19:24:55 2025 OS/Arch: linux/arm64 ... ``` diff --git a/go.mod b/go.mod index 3b39905bcde0..ee5efcf94a8e 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,18 @@ go 1.24.0 require ( github.com/docker/buildx v0.24.0 // indirect - github.com/docker/cli v28.2.0+incompatible // indirect + github.com/docker/cli v28.2.1+incompatible // indirect github.com/docker/compose/v2 v2.36.2 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.22.0 // indirect - github.com/moby/moby v28.2.0+incompatible // indirect + github.com/moby/moby v28.2.1+incompatible // indirect ) replace ( github.com/docker/buildx => github.com/docker/buildx v0.24.0 - github.com/docker/cli => github.com/docker/cli v28.2.0+incompatible + github.com/docker/cli => github.com/docker/cli v28.2.1+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.36.2 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.22.0 - github.com/moby/moby => github.com/moby/moby v28.2.0+incompatible + github.com/moby/moby => github.com/moby/moby v28.2.1+incompatible ) diff --git a/go.sum b/go.sum index cda9b06768f4..d575cdbfa0f0 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ github.com/docker/cli v28.1.0-rc.2+incompatible h1:BDhiR2nacubawpKAWFLqZmjGkARWP github.com/docker/cli v28.1.0-rc.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v28.2.0+incompatible h1:Tnor4OXVIBBPlTegk65OAL+TVlG1pQxsrTw08X8w9ao= github.com/docker/cli v28.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.2.1+incompatible h1:AYyTcuwvhl9dXdyCiXlOGXiIqSNYzTmaDNpxIISPGsM= +github.com/docker/cli v28.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/compose-cli v1.0.35 h1:uZyEHLalfqBS2PiTpA1LAULyJmuQ+YtZg7nG4Xl3/Cc= github.com/docker/compose-cli v1.0.35/go.mod h1:mSXI4hFLpRU3EtI8NTo32bNwI0UXSr8jnq+/rYjGAUU= github.com/docker/compose/v2 v2.22.0 h1:3rRz4L7tPU75wRsV8JZh2/aTgerQvPa1cpzZN+tHqUY= @@ -434,6 +436,8 @@ github.com/moby/moby v28.1.0-rc.2+incompatible h1:F9Ku4A7eCFvb9cYR/jk7sLC6U9+r2u github.com/moby/moby v28.1.0-rc.2+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/moby v28.2.0+incompatible h1:TtiT7qCEOZWnP0+GKsRUPUN3GPvSUt4/0oLOc2trQdk= github.com/moby/moby v28.2.0+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/moby/moby v28.2.1+incompatible h1:UYmHExYP8S0uGKDozhYw7RJ+LpANL51g4fa3qT0Q2GA= +github.com/moby/moby v28.2.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= diff --git a/hugo.yaml b/hugo.yaml index 6dbad3b505e8..c38ff0ab3bc7 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -135,10 +135,10 @@ params: # Latest version of the Docker Engine API latest_engine_api_version: "1.50" # Latest version of Docker Engine - docker_ce_version: "28.2.0" + docker_ce_version: "28.2.1" # Previous version of the Docker Engine # (Used to show e.g., "latest" and "latest"-1 in engine install examples - docker_ce_version_prev: "28.1.1" + docker_ce_version_prev: "28.1.0" # Latest Docker Compose version compose_version: "v2.36.2" # Latest BuildKit version diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html index e00638f94484..f79fcd46582c 100644 --- a/layouts/_default/_markup/render-codeblock.html +++ b/layouts/_default/_markup/render-codeblock.html @@ -40,7 +40,7 @@ > ` }} + {{- $emptyState := `
Start typing to search… or try
` }} {{- $emptyState | safe.HTML }} diff --git a/layouts/partials/sidebar/guides.html b/layouts/partials/sidebar/guides.html index f3220d1cb9f9..b601eae7ea62 100644 --- a/layouts/partials/sidebar/guides.html +++ b/layouts/partials/sidebar/guides.html @@ -28,7 +28,7 @@ {{- end }} {{- with ($root.Params.time) }} -
+
{{ partialCached "icon" "schedule" "schedule" }} diff --git a/layouts/partials/sidebar/sections.html b/layouts/partials/sidebar/sections.html index db2b971ae5ee..ff7b3cb0eca4 100644 --- a/layouts/partials/sidebar/sections.html +++ b/layouts/partials/sidebar/sections.html @@ -32,32 +32,36 @@ {{- end }} {{- range .Params.sidebar.groups }} -
  • - {{ . }} -
    • - {{- range where $pages "Params.sidebar.group" . }} - {{- if .IsSection }} - {{- template "renderList" . }} - {{- else }} - {{- template "renderSingle" . }} +
    +
  • + {{ . }} +
    • + {{- range where $pages "Params.sidebar.group" . }} + {{- if .IsSection }} + {{- template "renderList" . }} + {{- else }} + {{- template "renderSingle" . }} + {{- end }} {{- end }} - {{- end }} +
    {{- end }} + {{ end }} {{/* Recursive template for sidebar items */}} {{ define "renderList" }} {{ $isCurrent := eq page . }} {{ $expanded := or $isCurrent (page.IsDescendant .) }} -
  • +
  • -
    +
    {{- if .Permalink }} {{/* If the link is not empty, use it */}} + {{- else }} {{/* Otherwise, just expand the section */}} +
    +