From 8b0d99df87565d80371806165350806e4e1511c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 29 May 2025 12:22:35 +0200 Subject: [PATCH 1/9] vendor: github.com/moby/moby v28.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit full diff: https://github.com/moby/moby/compare/v28.2.0...v28.2.1 Signed-off-by: Paweł Gronowski --- _vendor/modules.txt | 2 +- go.mod | 4 ++-- go.sum | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 40a3c2f18774..70b99500ba37 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,4 +1,4 @@ -# 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 diff --git a/go.mod b/go.mod index 3b39905bcde0..d3a7b6111480 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( 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 ( @@ -17,5 +17,5 @@ replace ( 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..496ba0e01477 100644 --- a/go.sum +++ b/go.sum @@ -434,6 +434,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= From f0bc3a81e4da709803bce3eb09f4653b54e31380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 29 May 2025 12:24:37 +0200 Subject: [PATCH 2/9] vendor: github.com/docker/cli v28.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit full diff: https://github.com/docker/cli/compare/v28.2.0...v28.2.1 Signed-off-by: Paweł Gronowski --- _vendor/modules.txt | 2 +- go.mod | 4 ++-- go.sum | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 70b99500ba37..66af6e750448 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # 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/go.mod b/go.mod index d3a7b6111480..ee5efcf94a8e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ 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 @@ -13,7 +13,7 @@ require ( 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 diff --git a/go.sum b/go.sum index 496ba0e01477..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= From 3a609cdfa381537bfdc21d17b2176787c67709e1 Mon Sep 17 00:00:00 2001 From: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> Date: Thu, 29 May 2025 07:23:20 -0700 Subject: [PATCH 3/9] fix mailto links (#22715) ## Description Fix mailto links to work with the following syntax: `[email me](mailto:example@example.com)` Can verify at https://deploy-preview-22715--docsdocker.netlify.app/desktop/enterprise/ ## Related issues or tickets https://docker.slack.com/archives/C039ZM6GH4Z/p1748022452990369 ## Reviews - [ ] Editorial review Signed-off-by: Craig --- layouts/_default/_markup/render-link.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index ce4701398413..39e53cd65a80 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1,14 +1,15 @@ {{ $url := .Destination }} {{- if (strings.HasPrefix $url "http") -}} {{/* external link, add icon */}} - - {{- .Text | safeHTML -}} - - {{- partialCached "icon" "open_in_new" "open_in_new" -}} - + + {{ .Text | safeHTML }} + + {{ partialCached "icon" "open_in_new" "open_in_new" }} + + +{{- else if (strings.HasPrefix $url "mailto:") -}} + {{/* mailto link, render as normal link */}} + {{ .Text | safeHTML }} {{- else if (strings.HasPrefix $url "/") -}} {{ if (strings.HasSuffix (urls.Parse $url).Path ".md") }} {{/* abs path to markdown file, use ref */}} From 9023d51e4fbdf01f55fef8456e8eb7b5c092bf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 29 May 2025 12:35:30 +0200 Subject: [PATCH 4/9] docker: 28.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- content/manuals/engine/release-notes/28.md | 8 ++++++++ content/reference/api/engine/_index.md | 8 ++++---- hugo.yaml | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) 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/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 From bfff5e0b335f46ac9a529b2ba46f1e884384d1e5 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 30 May 2025 08:24:51 +0100 Subject: [PATCH 5/9] Merge pull request #22721 from djs55/wsl2-version update Docker Desktop minimum WSL 2 version to 2.1.5 --- content/manuals/desktop/features/wsl/_index.md | 2 +- content/manuals/desktop/features/wsl/best-practices.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 1686e58dd136b3fc6f0bbf2763776ab9b0d5d1f5 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 30 May 2025 11:57:20 +0200 Subject: [PATCH 6/9] fix: various theme improvements (#22725) Harmonize various areas of the theme. --- assets/css/global.css | 3 ++ assets/css/utilities.css | 13 ++++- .../_default/_markup/render-codeblock.html | 4 +- layouts/guides/single.html | 3 -- layouts/index.html | 6 +-- layouts/partials/languages.html | 2 +- layouts/partials/search-bar.html | 2 +- layouts/partials/sidebar/guides.html | 2 +- layouts/partials/sidebar/sections.html | 54 ++++++++++--------- 9 files changed, 53 insertions(+), 36 deletions(-) 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..9141f145f05a 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); 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 */}} +
    +