2 files changed, 9 insertions, 9 deletions

diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index 0078ab6d..43327a92 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -44,8 +44,8 @@ DESCRIPTION = "Linux container runtime \
 # so we get that tag, and make it our SRCREVS:
 #
 
-SRCREV_moby = "d1a720cb15d99821e7b96197b0f01ffea33b7356"
-SRCREV_cli = "171a9b70b2736c719019393259ecebdcac47bead"
+SRCREV_moby = "8abd12c5bb916f16d4c778ab09ea024de3a0e9f7"
+SRCREV_cli = "df016a3a9538efb6d7d6e7c3baf291dbbe28eee0"
 SRCREV_FORMAT = "moby"
 SRC_URI = "\
         git://github.com/moby/moby.git;nobranch=1;name=moby;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
@@ -64,7 +64,7 @@ require docker.inc
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
 
-DOCKER_VERSION = "29.0.0-rc.1"
+DOCKER_VERSION = "v29.2.1"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 CVE_PRODUCT = "docker mobyproject:moby"
diff --git a/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch b/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
index 948f5ce8..79d60cc9 100644
--- a/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
+++ b/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
@@ -39,7 +39,7 @@ Index: import/hack/make/.binary
 ===================================================================
 --- import.orig/hack/make/.binary
 +++ import/hack/make/.binary
-@@ -3,7 +3,7 @@ set -e
+@@ -3,7 +3,7 @@
  
  # a helper to provide ".exe" when it's appropriate
  binary_extension() {
@@ -48,10 +48,10 @@ Index: import/hack/make/.binary
                 echo -n '.exe'
         fi
  }
-@@ -16,31 +16,10 @@ source "${MAKEDIR}/.go-autogen"
- (
-        export GOGC=${DOCKER_BUILD_GOGC:-1000}
+@@ -14,31 +14,10 @@
+ source "${MAKEDIR}/.go-autogen"
  
+ (
 -       if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
 -               # must be cross-compiling!
 -               if [ "$(go env GOOS)/$(go env GOARCH)" = "linux/arm" ]; then
@@ -81,7 +81,7 @@ Index: import/hack/make/.binary
                                 linux/mips* | linux/ppc64)
                                         # -buildmode=pie is not supported on Linux mips*, ppc64be
                                         # https://github.com/golang/go/blob/go1.24.3/src/internal/platform/supported.go#L188-L200
-@@ -67,11 +46,11 @@ source "${MAKEDIR}/.go-autogen"
+@@ -65,11 +44,11 @@
         # only necessary for non-sandboxed invocation where TARGETPLATFORM is empty
         PLATFORM_NAME=$TARGETPLATFORM
         if [ -z "$PLATFORM_NAME" ]; then
@@ -98,7 +98,7 @@ Index: import/hack/make/.binary
                 fi
         fi
  
-@@ -95,7 +74,7 @@ source "${MAKEDIR}/.go-autogen"
+@@ -93,7 +72,7 @@
         if [ -n "$DOCKER_DEBUG" ]; then
                 set -x
         fi