Skip to content

Commit bd69c3a

Browse files
Merge pull request #23024 from docker/published-update
publish updates from main
2 parents 5d60e3e + ca66711 commit bd69c3a

File tree

6 files changed

+36
-12
lines changed

6 files changed

+36
-12
lines changed

_vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# github.com/moby/buildkit v0.23.1
33
# github.com/docker/buildx v0.25.0
44
# github.com/docker/cli v28.3.0+incompatible
5-
# github.com/docker/compose/v2 v2.38.1
5+
# github.com/docker/compose/v2 v2.38.2
66
# github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2
77
# github.com/docker/scout-cli v1.15.0

content/manuals/compose/releases/release-notes.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@ For more detailed information, see the [release notes in the Compose repo](https
1515

1616
## 2.38.1
1717

18+
{{< release-date date="2025-07-08" >}}
19+
20+
### Bug fixes and enhancements
21+
22+
- Added `--networks` flag to `config` command to list networks
23+
- Fixed an issue on `down` command with Docker Model Runner used as a provider service
24+
- Fixed a display issue on Docker Model Runner progress
25+
- Fixed an issue with services with profile missing secrets
26+
27+
### Update
28+
29+
- Dependencies upgrade: bump docker engine and cli to v28.3.1
30+
- Dependencies upgrade: bump buildkit to v0.23.2
31+
- Dependencies upgrade: bump golang to v1.23.10
32+
33+
## 2.38.1
34+
1835
{{< release-date date="2025-06-30" >}}
1936

2037
### Bug fixes and enhancements

content/manuals/desktop/features/kubernetes.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,16 @@ The recommended approach to set this up is the following:
214214
215215
> [!NOTE]
216216
>
217-
> When using `KubernetesImagesRepository` and [Enhanced Container Isolation (ECI)](../../security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md)
217+
> In Docker Desktop versions 4.43 or earlier: when using `KubernetesImagesRepository` and [Enhanced Container Isolation (ECI)](../../security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md)
218218
> is enabled, add the following images to the [ECI Docker socket mount image list](../../security/for-admins/hardened-desktop/settings-management/configure-json-file.md#enhanced-container-isolation):
219219
>
220-
> * [imagesRepository]/desktop-cloud-provider-kind:*
221-
> * [imagesRepository]/desktop-containerd-registry-mirror:*
220+
> `[imagesRepository]/desktop-cloud-provider-kind:*`
221+
> `[imagesRepository]/desktop-containerd-registry-mirror:*`
222222
>
223-
> These containers mount the Docker socket, so you must add the images to the ECI images list. If not,
224-
> ECI will block the mount and Kubernetes won't start.
223+
> These containers mount the Docker socket, so you must add the images to the
224+
> ECI images list. If not, ECI will block the mount and Kubernetes won't
225+
> start. This does not apply to Docker Desktop 4.44 or later because it
226+
> automatically allows these images to mount the Docker socket.
225227
226228
## Troubleshooting
227229

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,17 @@ quit and reopened.
290290

291291
> [!NOTE]
292292
>
293-
> When using the `imagesRepository` setting and Enhanced Container Isolation (ECI), add the following images to the [ECI Docker socket mount image list](#enhanced-container-isolation):
293+
> In Docker Desktop versions 4.43 or earlier: when using the `imagesRepository`
294+
> setting and Enhanced Container Isolation (ECI), add the following images to
295+
> the [ECI Docker socket mount image list](#enhanced-container-isolation):
294296
>
295-
> * [imagesRepository]/desktop-cloud-provider-kind:*
296-
> * [imagesRepository]/desktop-containerd-registry-mirror:*
297+
> `[imagesRepository]/desktop-cloud-provider-kind:*`
298+
> `[imagesRepository]/desktop-containerd-registry-mirror:*`
297299
>
298-
> These containers mount the Docker socket, so you must add the images to the ECI images list. If not, ECI will block the mount and Kubernetes won't start.
300+
> These containers mount the Docker socket, so you must add the images to the
301+
> ECI images list. If not, ECI will block the mount and Kubernetes won't start.
302+
> This does not apply to Docker Desktop 4.44 or later because it automatically
303+
> allows these images to mount the Docker socket.
299304
300305
### Networking
301306

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/distribution/reference v0.6.0 // indirect
1818
github.com/docker/buildx v0.25.0 // indirect
1919
github.com/docker/cli v28.3.0+incompatible // indirect
20-
github.com/docker/compose/v2 v2.38.1 // indirect
20+
github.com/docker/compose/v2 v2.38.2 // indirect
2121
github.com/docker/distribution v2.8.3+incompatible // indirect
2222
github.com/docker/docker v28.3.0+incompatible // indirect
2323
github.com/docker/docker-credential-helpers v0.9.3 // indirect

hugo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ params:
140140
# (Used to show e.g., "latest" and "latest"-1 in engine install examples
141141
docker_ce_version_prev: "28.3.0"
142142
# Latest Docker Compose version
143-
compose_version: "v2.38.1"
143+
compose_version: "v2.38.2"
144144
# Latest BuildKit version
145145
buildkit_version: "0.23.2"
146146

0 commit comments

Comments
 (0)