From 0d3955459ed862bdf8e29f04162adb57e48e15bc Mon Sep 17 00:00:00 2001
From: Guillaume Lours <705411+glours@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:11:42 +0200
Subject: [PATCH] update Compose release notes for version 2.29.4 (#20913)

* update Compose release notes for version 2.29.4

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>

* Apply suggestions from code review

---------

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com>
---
 _vendor/modules.txt                      |  2 +-
 content/manuals/compose/release-notes.md | 14 ++++++++++++++
 go.mod                                   |  2 +-
 hugo.yaml                                |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/_vendor/modules.txt b/_vendor/modules.txt
index fe87e70926..030df1a9a0 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.0
 # github.com/docker/cli v27.2.2-0.20240909090509-65decb573126+incompatible
-# github.com/docker/compose/v2 v2.29.3
+# github.com/docker/compose/v2 v2.29.4
 # github.com/docker/scout-cli v1.13.0
diff --git a/content/manuals/compose/release-notes.md b/content/manuals/compose/release-notes.md
index 8d85d4691d..060a6180ab 100644
--- a/content/manuals/compose/release-notes.md
+++ b/content/manuals/compose/release-notes.md
@@ -11,6 +11,20 @@ aliases:
 
 For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/).
 
+## 2.29.4
+
+{{< release-date date="2024-09-16" >}}
+
+### Update
+
+- Dependencies upgrade: bump buildx to v0.17.1
+- Dependencies upgrade: bump docker engine and cli to v27.3.0-rc.1
+
+### Bug fixes and enhancements
+
+- Fixed an issue with services not stopping when restarting diverged dependencies. 
+- Fixed potential `nil` pointer error on the OTEL client.
+
 ## 2.29.3
 
 {{< release-date date="2024-09-12" >}}
diff --git a/go.mod b/go.mod
index 5ae61cab24..8267bef4dc 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.5
 require (
 	github.com/docker/buildx v0.17.0 // indirect
 	github.com/docker/cli v27.2.2-0.20240909090509-65decb573126+incompatible // indirect
-	github.com/docker/compose/v2 v2.29.3 // indirect
+	github.com/docker/compose/v2 v2.29.4 // indirect
 	github.com/docker/scout-cli v1.13.0 // indirect
 	github.com/moby/buildkit v0.16.0 // indirect
 	github.com/moby/moby v27.2.1+incompatible // indirect
diff --git a/hugo.yaml b/hugo.yaml
index 8f7af856a7..f76b5a0e90 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -105,7 +105,7 @@ params:
 
   latest_engine_api_version: "1.47"
   docker_ce_version: "27.2.1"
-  compose_version: "v2.29.3"
+  compose_version: "v2.29.4"
   compose_file_v3: "3.8"
   compose_file_v2: "2.4"
   buildkit_version: "0.16.0"