From 0359116d0279b9721adc98159a1c57c262fe17e0 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:55:16 +0100 Subject: [PATCH 1/2] release-notes for Compose v2.30.1 version Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- _vendor/modules.txt | 2 +- content/manuals/compose/releases/release-notes.md | 13 +++++++++++++ go.mod | 4 ++-- go.sum | 2 ++ hugo.yaml | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 49cad9b66715..5460f41e4404 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,5 +2,5 @@ # github.com/moby/buildkit v0.16.0 # github.com/docker/buildx v0.17.1 # github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible -# github.com/docker/compose/v2 v2.30.0 +# github.com/docker/compose/v2 v2.30.1 # github.com/docker/scout-cli v1.13.0 diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index df95b0bc75d7..c8cfc63bd6c3 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,6 +13,19 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.30.1 + +{{< release-date date="2024-10-30" >}} + +### Update + +- Dependencies upgrade: bump compose-go to v2.4.2 + +### Bug fixes and enhancements + +- Fixed a regression when using stdin as input of `-f` flag +- Fixed a regression when using multiple time the same YAML anchor in a Compose file + ## 2.30.0 {{< release-date date="2024-10-29" >}} diff --git a/go.mod b/go.mod index 7e88fc496b6a..dc30c721c03d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.1 require ( github.com/docker/buildx v0.17.1 // indirect github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible // indirect - github.com/docker/compose/v2 v2.30.0 // indirect + github.com/docker/compose/v2 v2.30.1 // indirect github.com/docker/scout-cli v1.13.0 // indirect github.com/moby/buildkit v0.16.0 // indirect github.com/moby/moby v27.3.1+incompatible // indirect @@ -14,7 +14,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.17.1 github.com/docker/cli => github.com/docker/cli v27.3.1+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.0 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.1 github.com/docker/scout-cli => github.com/docker/scout-cli v1.13.0 github.com/moby/buildkit => github.com/moby/buildkit v0.16.0 github.com/moby/moby => github.com/moby/moby v27.3.1+incompatible diff --git a/go.sum b/go.sum index 9aef408d12cc..a5ee7ec98270 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ github.com/docker/compose/v2 v2.29.2 h1:gRlR2ApZ0IGcwmSUb/wlEVCk18Az8b7zl03hJArl github.com/docker/compose/v2 v2.29.2/go.mod h1:U+yqqZqYPhILehkmmir+Yh7ZhCfkKqAvaZdrM47JBRs= github.com/docker/compose/v2 v2.30.0 h1:EjtEBeIPeqzlY3DUQhdjkiMwigX8TrUrgPAyAqey1d0= github.com/docker/compose/v2 v2.30.0/go.mod h1:WlU5gYgsYfNLuDeUdTusvutEC5PV3sDc15aClbR5lPw= +github.com/docker/compose/v2 v2.30.1 h1:AwDaEcmgskxaI75Wjt3KL6/Xqq/GXKUQcBpo/RqMEkw= +github.com/docker/compose/v2 v2.30.1/go.mod h1:pt/uv8KQ6VaM0IbHZwB1UdwDIs9PB4nN4LoWst+dqXc= 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 385eb2c21e11..802980288a66 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -112,7 +112,7 @@ params: latest_engine_api_version: "1.47" docker_ce_version: "27.2.1" - compose_version: "v2.30.0" + compose_version: "v2.30.1" compose_file_v3: "3.8" compose_file_v2: "2.4" buildkit_version: "0.16.0" From c51df4f65abe0501bc0ac1692501748169cdeac2 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:03:05 +0000 Subject: [PATCH 2/2] Apply suggestions from code review --- content/manuals/compose/releases/release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index c8cfc63bd6c3..ccf4f263a7a8 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -23,8 +23,8 @@ For more detailed information, see the [release notes in the Compose repo](https ### Bug fixes and enhancements -- Fixed a regression when using stdin as input of `-f` flag -- Fixed a regression when using multiple time the same YAML anchor in a Compose file +- Fixed a regression when using stdin as input for `-f` flag +- Fixed a regression when using the same YAML anchor multiple times in a Compose file ## 2.30.0