From d9aafedd32744d01f641ea5c940f3afe4f178e2b Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 13 Feb 2025 09:46:57 +0100 Subject: [PATCH 1/2] Bump compose v2.33.0 Signed-off-by: Nicolas De Loof --- _vendor/modules.txt | 2 +- .../manuals/compose/releases/release-notes.md | 39 +++++++++++++++++++ go.mod | 2 +- hugo.yaml | 2 +- 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/_vendor/modules.txt b/_vendor/modules.txt index ae4caa515541..24989ba511d1 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,5 +2,5 @@ # github.com/moby/buildkit v0.19.0 # github.com/docker/buildx v0.20.1 # github.com/docker/cli v27.5.1+incompatible -# github.com/docker/compose/v2 v2.32.4 +# github.com/docker/compose/v2 v2.33.0 # 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 3cf8874e34f4..15fa98fd2a30 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,6 +13,45 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.33.0 + +{{< release-date date="2025-02-13" >}} + +### Bug fixes and enhancements + +- Introduced a hint to promote use of [Bake](/build/bake/) +- Introduced support for `additional_context` reference to another service +- Added support for `BUILDKIT_PROGRESS` +- Warn user when published compose application includes environment +- Added `--with-env` to publish a compose application with environment +- Updated `ls --quiet` help description +- Fixed multiple issues delegating build to Bake +- Updated help in `stats` command +- Fixed support for "builtin" seccomp profile +- Fixed support for watch with multiple services +- Removed exit code per error type used by legacy metrics system +- Fixed test coverage for `compatibility` +- Removed raw os.Args sent to opentelemetry +- Enabled copyloopvar linter +- Fixed provenance for binaries and generate sbom +- use main branch for docs upstream validation +- Added codeowners file +- Added docker engine v28.x to the test-matrix + +### Update + +- Dependencies upgrade: Bump compose-go v2.4.8 +- Dependencies upgrade: Bump buildx v0.20.1 +- Dependencies upgrade: Bump docker to v27.5.1 +- Dependencies upgrade: Bump golangci-lint to v1.63.4 +- Dependencies upgrade: Bump golang.org/x/sys from 0.28.0 to 0.30.0 +- Dependencies upgrade: Bump github.com/moby/term v0.5.2 +- Dependencies upgrade: Bump github.com/otiai10/copy from 1.14.0 to 1.14.1 +- Dependencies upgrade: Bump github.com/jonboulle/clockwork from 0.4.0 to 0.5.0 +- Dependencies upgrade: Bump github.com/spf13/pflag from 1.0.5 to 1.0.6 +- Dependencies upgrade: Bump golang.org/x/sync from 0.10.0 to 0.11.0 +- Dependencies upgrade: Bump gotest.tools/v3 from 3.5.1 to 3.5.2 + ## 2.32.4 {{< release-date date="2025-01-16" >}} diff --git a/go.mod b/go.mod index fc8141cfeb4b..01444cbfba7a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.1 require ( github.com/docker/buildx v0.20.1 // indirect github.com/docker/cli v27.5.1+incompatible // indirect - github.com/docker/compose/v2 v2.32.4 // indirect + github.com/docker/compose/v2 v2.33.0 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.19.0 // indirect github.com/moby/moby v27.5.1+incompatible // indirect diff --git a/hugo.yaml b/hugo.yaml index f82c878f764e..8a0fae47d5a5 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -118,7 +118,7 @@ params: # (Used to show e.g., "latest" and "latest"-1 in engine install examples docker_ce_version_prev: "27.5.0" # Latest Docker Compose version - compose_version: "v2.32.4" + compose_version: "v2.33.0" # Latest BuildKit version buildkit_version: "0.16.0" From 939a4bf90bbd5146e0990379543dc53413ef4ab4 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:07:40 +0000 Subject: [PATCH 2/2] Apply suggestions from code review --- .../manuals/compose/releases/release-notes.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index 15fa98fd2a30..4a93a7da337e 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -19,24 +19,24 @@ For more detailed information, see the [release notes in the Compose repo](https ### Bug fixes and enhancements -- Introduced a hint to promote use of [Bake](/build/bake/) -- Introduced support for `additional_context` reference to another service +- Introduced a hint to promote the use of [Bake](/build/bake/) +- Introduced support for the `additional_context` attribute referencing another service - Added support for `BUILDKIT_PROGRESS` -- Warn user when published compose application includes environment -- Added `--with-env` to publish a compose application with environment +- Compose now warns you when a published Compose application includes environment variables +- Added a `--with-env` flag to publish a Compose application with environment variables - Updated `ls --quiet` help description - Fixed multiple issues delegating build to Bake - Updated help in `stats` command - Fixed support for "builtin" seccomp profile -- Fixed support for watch with multiple services +- Fixed support for `watch` with multiple services - Removed exit code per error type used by legacy metrics system - Fixed test coverage for `compatibility` -- Removed raw os.Args sent to opentelemetry +- Removed raw os.Args sent to OpenTelemetry - Enabled copyloopvar linter -- Fixed provenance for binaries and generate sbom -- use main branch for docs upstream validation +- Fixed provenance for binaries and generate SBOM +- Main branch for docs upstream validation is now used - Added codeowners file -- Added docker engine v28.x to the test-matrix +- Added Docker Engine v28.x to the test-matrix ### Update