From cd03a7b69ed9b9ec6df585af23b4f12fd347c921 Mon Sep 17 00:00:00 2001
From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com>
Date: Tue, 12 Mar 2024 08:42:08 +0000
Subject: [PATCH] Engdocs 2024 (#19600)

* Update Compose version

* add release notes
---
 _vendor/modules.txt              |  6 +++---
 content/compose/release-notes.md | 23 +++++++++++++++++++++++
 go.mod                           |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/_vendor/modules.txt b/_vendor/modules.txt
index e6afe49e76..352bf3bc57 100644
--- a/_vendor/modules.txt
+++ b/_vendor/modules.txt
@@ -1,6 +1,6 @@
 # github.com/moby/moby v25.0.4+incompatible
-# github.com/moby/buildkit v0.13.0-rc3.0.20240308080452-a38011b9f57d
-# github.com/docker/buildx v0.0.0-00010101000000-000000000000
+# github.com/moby/buildkit v0.13.0
+# github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315
 # github.com/docker/scout-cli v1.4.1
 # github.com/docker/cli v26.0.0-rc1+incompatible
-# github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000
+# github.com/docker/compose/v2 v2.24.7
diff --git a/content/compose/release-notes.md b/content/compose/release-notes.md
index 9a16a705e7..d375620bbe 100644
--- a/content/compose/release-notes.md
+++ b/content/compose/release-notes.md
@@ -11,6 +11,29 @@ aliases:
 
 For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/).
 
+## 2.24.7
+{{< release-date date="2024-03-06" >}}
+
+### Update
+- Dependencies upgrade: bump golang to 1.21.8
+- Dependencies upgrade: bump compose-go to 2.0.0-rc8
+- Dependencies upgrade: bump docker to v24.0.4
+
+### Bug fixes and enhancements
+
+- Compose now ensures stable priority sort order for networks 
+- Fixed interpolation with curly braces (e.g. JSON) in default values 
+- Fixed validation for non-unique `container_name` values
+- Fixed validation for `develop.watch`
+- Fixed environment loading for `include`
+- Fixed panic when merging labels/networks
+- Added support for `--no-path-resolution` when using `include`
+- Fixed missing project name errors
+- Fixed `--no-interpolate` flag on `config`
+- Added a workaround for file lock issues with Watch mode on Windows
+- Fixed duplicate exit code status messages
+- Compose now respects `COMPOSE_REMOVE_ORPHANS` on `up`
+
 ## 2.24.6
 {{< release-date date="2024-02-15" >}}
 
diff --git a/go.mod b/go.mod
index 34ea55f8ca..c9f9a39459 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.21.1
 require (
 	github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315 // indirect
 	github.com/docker/cli v26.0.0-rc1+incompatible // indirect
-	github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 // indirect
+	github.com/docker/compose/v2 v2.24.7 // indirect
 	github.com/docker/scout-cli v1.4.1 // indirect
 	github.com/moby/buildkit v0.13.0 // indirect
 	github.com/moby/moby v25.0.4+incompatible // indirect