From 8477c166c590e3962935a6528feb4bfc031b6b67 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Fri, 23 May 2025 16:28:46 +0200 Subject: [PATCH 1/2] release-notes for Compose v2.36.2 version Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- _vendor/modules.txt | 2 +- .../manuals/compose/releases/release-notes.md | 16 ++++++++++++++++ go.mod | 4 ++-- go.sum | 2 ++ hugo.yaml | 2 +- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 421fd7c081dd..162fbb7efe17 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,5 +2,5 @@ # github.com/moby/buildkit v0.22.0 # github.com/docker/buildx v0.24.0 # github.com/docker/cli v28.1.1+incompatible -# github.com/docker/compose/v2 v2.36.1 +# github.com/docker/compose/v2 v2.36.2 # github.com/docker/scout-cli v1.15.0 diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index 0ebbd27b47c2..d2350154abf0 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -15,6 +15,22 @@ For more detailed information, see the [release notes in the Compose repo](https ## 2.36.1 +{{< release-date date="2025-05-23" >}} + +### Bug fixes and enhancements + +- Fixed an issue with random port allocation +- Fixed an issue recreating containers when not needed during inner loop +- Fixed a problem during `up --build` wiht `additional_context` + +### Update + +- Dependencies upgrade: bump compose-go to v2.6.4 +- Dependencies upgrade: bump buildx to v0.24.0 +- Dependencies upgrade: bump buildkit to v0.22.0 + +## 2.36.1 + {{< release-date date="2025-05-19" >}} ### Bug fixes and enhancements diff --git a/go.mod b/go.mod index 95a388700746..6bc998dde895 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.0 require ( github.com/docker/buildx v0.24.0 // indirect github.com/docker/cli v28.1.1+incompatible // indirect - github.com/docker/compose/v2 v2.36.1 // 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.1.0-rc.2+incompatible // indirect @@ -14,7 +14,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.24.0 github.com/docker/cli => github.com/docker/cli v28.1.0-rc.2+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.36.1 + 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-rc1 github.com/moby/moby => github.com/moby/moby v28.1.0-rc.2+incompatible diff --git a/go.sum b/go.sum index efc590142880..a81e8aad1706 100644 --- a/go.sum +++ b/go.sum @@ -239,6 +239,8 @@ github.com/docker/compose/v2 v2.36.0 h1:MACSfQ2xqcwgCwAtsHVoQkFbHi2nNfNAsd5EWFg1 github.com/docker/compose/v2 v2.36.0/go.mod h1:kFPppTinl2Q0Lv3Dy9titIL41oWYoUkNxoKQZb/lfSU= github.com/docker/compose/v2 v2.36.1 h1:BmTE1Ps6XDOuubyL97ucPvIn8Nq2XprRylE2dgCtTXw= github.com/docker/compose/v2 v2.36.1/go.mod h1:w6fj+dvMW9W0gFaTpIwJ2PYstqiGIC07Cajp5wPukO0= +github.com/docker/compose/v2 v2.36.2 h1:rxk1PUUbhbAS6HkGsYo9xUmMBpKtVwFMNCQjE4+i5fk= +github.com/docker/compose/v2 v2.36.2/go.mod h1:mZygkne+MAMu/e1B28PBFmG0Z0WefbxZ/IpcjSFdrw8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= diff --git a/hugo.yaml b/hugo.yaml index da91269bc731..3677727b3179 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.1.0" # Latest Docker Compose version - compose_version: "v2.36.1" + compose_version: "v2.36.2" # Latest BuildKit version buildkit_version: "0.21.0" From e8cb175a5fc2efa105d7cfd58b18aabf45f6a699 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Fri, 23 May 2025 16:32:17 +0100 Subject: [PATCH 2/2] Update content/manuals/compose/releases/release-notes.md --- content/manuals/compose/releases/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index d2350154abf0..8458085d8fb9 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -21,7 +21,7 @@ For more detailed information, see the [release notes in the Compose repo](https - Fixed an issue with random port allocation - Fixed an issue recreating containers when not needed during inner loop -- Fixed a problem during `up --build` wiht `additional_context` +- Fixed a problem during `up --build` with `additional_context` ### Update