From 65af311dfe265ce70e06a1b88e13f6cfd89bb3b9 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Fri, 17 Oct 2025 15:52:50 +0200 Subject: [PATCH 1/2] release-notes for Compose v2.40.1 version Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- .../v2/docs/reference/compose_publish.md | 1 + .../docker_compose_alpha_publish.yaml | 10 +++++++ .../reference/docker_compose_publish.yaml | 10 +++++++ _vendor/modules.txt | 2 +- .../manuals/compose/releases/release-notes.md | 28 +++++++++++++++---- go.mod | 12 ++++---- go.sum | 3 ++ hugo.yaml | 2 +- 8 files changed, 54 insertions(+), 14 deletions(-) diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md index 8e5d181336b2..9a82fc260a73 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md @@ -7,6 +7,7 @@ Publish compose application | Name | Type | Default | Description | |:--------------------------|:---------|:--------|:-------------------------------------------------------------------------------| +| `--app` | `bool` | | Published compose application (includes referenced images) | | `--dry-run` | `bool` | | Execute command in dry run mode | | `--oci-version` | `string` | | OCI image/artifact specification version (automatically determined by default) | | `--resolve-image-digests` | `bool` | | Pin image tags to digests | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml index 2c92249395c6..9ab6a20c4537 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml @@ -5,6 +5,16 @@ usage: docker compose alpha publish [OPTIONS] REPOSITORY[:TAG] pname: docker compose alpha plink: docker_compose_alpha.yaml options: + - option: app + value_type: bool + default_value: "false" + description: Published compose application (includes referenced images) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: oci-version value_type: string description: | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml index 44a7a46dd421..e939a8ff897d 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml @@ -5,6 +5,16 @@ usage: docker compose publish [OPTIONS] REPOSITORY[:TAG] pname: docker compose plink: docker_compose.yaml options: + - option: app + value_type: bool + default_value: "false" + description: Published compose application (includes referenced images) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: oci-version value_type: string description: | diff --git a/_vendor/modules.txt b/_vendor/modules.txt index fe1c8f0190fe..361ab0ca1ac1 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,5 +1,5 @@ # github.com/moby/moby v28.5.1+incompatible -# github.com/moby/buildkit v0.25.0 +# github.com/moby/buildkit v0.25.1 # github.com/docker/buildx v0.29.1 # github.com/docker/cli v28.5.1+incompatible # github.com/docker/compose/v2 v2.40.0 diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index 4e8aa514b97b..f91842f58a21 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -15,19 +15,22 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). -## 2.39.4 +## 2.40.1 -{{< release-date date="2025-09-19" >}} +{{< release-date date="2025-10-17" >}} ### Bug fixes and enhancements -- Added `initial_sync` attribute to the Compose Develop Specification definition, to sync files after starting a watch session -- Fixed a TLS issue when building with bake -- Disabled Tty on `run` when running as a piped command +- Fixed few issues when building with bake +- Added support of extends with profiles when using `publish` command +- Added support of `CTRL+Z` to run Compose in background +- Fixed Secret/Config setup of uid:gid to match container's USER definition ### Update -- Dependencies upgrade: bump compose-go to v2.9.0 +- Dependencies upgrade: bump docker engine and cli to v28.5.1 +- Dependencies upgrade: bump buildx to v0.29.1 +- Dependencies upgrade: bump golang to v1.24.9 ## 2.40.0 @@ -43,6 +46,19 @@ For more detailed information, see the [release notes in the Compose repo](https - Dependencies upgrade: bump docker engine and cli to v28.5.0 +## 2.39.4 + +{{< release-date date="2025-09-19" >}} + +### Bug fixes and enhancements + +- Added `initial_sync` attribute to the Compose Develop Specification definition, to sync files after starting a watch session +- Fixed a TLS issue when building with bake +- Disabled Tty on `run` when running as a piped command + +### Update + +- Dependencies upgrade: bump compose-go to v2.9.0 ## 2.39.3 diff --git a/go.mod b/go.mod index ab6a35c4b6f1..98f76b982607 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/docker/docs -go 1.24.7 +go 1.24.9 require ( github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect @@ -30,7 +30,7 @@ require ( github.com/docker/cli v28.5.1+incompatible // indirect; see "replace" rule at the bottom for actual version github.com/docker/compose/v2 v2.40.0 // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v28.4.0+incompatible // indirect; see "replace" rule at the bottom for actual version + github.com/docker/docker v28.5.1+incompatible // indirect; see "replace" rule at the bottom for actual version github.com/docker/docker-credential-helpers v0.9.3 // indirect github.com/docker/go-connections v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect @@ -68,7 +68,7 @@ require ( github.com/mattn/go-shellwords v1.0.12 // indirect github.com/microcosm-cc/bluemonday v1.0.27 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/moby/buildkit v0.25.0 // indirect + github.com/moby/buildkit v0.25.1 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/moby v28.5.1+incompatible // indirect; see "replace" rule at the bottom for actual version @@ -115,7 +115,7 @@ require ( golang.org/x/mod v0.25.0 // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/sync v0.17.0 // indirect - golang.org/x/sys v0.36.0 // indirect + golang.org/x/sys v0.37.0 // indirect golang.org/x/term v0.32.0 // indirect golang.org/x/text v0.26.0 // indirect golang.org/x/tools v0.34.0 // indirect @@ -132,11 +132,11 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.29.1 github.com/docker/cli => github.com/docker/cli v28.5.1+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.39.4 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.40.1 github.com/docker/docker => github.com/docker/docker v28.4.0+incompatible + github.com/docker/mcp-gateway => github.com/docker/mcp-gateway v0.22.0 github.com/docker/model-runner/cmd/cli => github.com/docker/model-runner/cmd/cli v0.1.44 github.com/docker/scout-cli => github.com/docker/scout-cli v1.18.4 github.com/moby/buildkit => github.com/moby/buildkit v0.25.0 github.com/moby/moby => github.com/moby/moby v28.5.1+incompatible - github.com/docker/mcp-gateway => github.com/docker/mcp-gateway v0.22.0 ) diff --git a/go.sum b/go.sum index 2b55622f7532..d271d17567b7 100644 --- a/go.sum +++ b/go.sum @@ -102,6 +102,7 @@ github.com/docker/compose/v2 v2.39.3 h1:a9itRH/aBf9jJM80hQqQYdIzm4+9hcccJRnK5w0F github.com/docker/compose/v2 v2.39.3/go.mod h1:AOUEk2X2GpWNn/x/WNN55cc+JkH3mBd6gmx71lHZHv4= github.com/docker/compose/v2 v2.39.4 h1:lXIyl0axf8rZ5ThGm25g0y5nvtj1a9HKS08qfMvHiFM= github.com/docker/compose/v2 v2.39.4/go.mod h1:HrP3GcmLSdb1YbhcRhr1zWx/8Ulj/9Y+H443hlTAwMA= +github.com/docker/compose/v2 v2.40.1/go.mod h1:CbSJpKGw20LInVsPjglZ8z7Squ3OBQOD7Ux5nkjGfIU= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw= @@ -441,6 +442,8 @@ golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/hugo.yaml b/hugo.yaml index 3d22f327e685..daf707c30378 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -140,7 +140,7 @@ params: # (Used to show e.g., "latest" and "latest"-1 in engine install examples docker_ce_version_prev: "28.5.0" # Latest Docker Compose version - compose_version: "v2.40.0" + compose_version: "v2.40.1" # Latest BuildKit version buildkit_version: "0.25.0" From f280cbb4ecef03ba391f7577d986e25801a94b8e Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 20 Oct 2025 09:28:59 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- content/manuals/compose/releases/release-notes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index f91842f58a21..9db80b46d3c0 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -21,10 +21,10 @@ For more detailed information, see the [release notes in the Compose repo](https ### Bug fixes and enhancements -- Fixed few issues when building with bake -- Added support of extends with profiles when using `publish` command +- Fixed a few issues when building with bake +- Added support of extends with profiles when using the `publish` command - Added support of `CTRL+Z` to run Compose in background -- Fixed Secret/Config setup of uid:gid to match container's USER definition +- Fixed secret/config setup of uid:gid to match container's USER definition ### Update