2 files changed, 13 insertions, 13 deletions

diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index aacfe6a0..b619a780 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -44,9 +44,9 @@ DESCRIPTION = "Linux container runtime \
 # so we get that tag, and make it our SRCREVS:
 #
 
-SRCREV_moby = "00e46f85f6e46bb4b02c33da253f901c473794e9"
+SRCREV_moby = "1a7969545d73537545645f5cd2c79b7a77e7d39f"
 SRCREV_libnetwork = "67e0588f1ddfaf2faf4c8cae8b7ea2876434d91c"
-SRCREV_cli = "b74562d917779426ae5010dd8d8bd9140075a741"
+SRCREV_cli = "ed223bc820ee9bb7005a333013b86203a9e1bc23"
 SRCREV_FORMAT = "moby_libnetwork"
 SRC_URI = "\
         git://github.com/moby/moby.git;branch=24.0;name=moby;protocol=https \
@@ -66,7 +66,7 @@ require docker.inc
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
 
-DOCKER_VERSION = "24.0.5"
+DOCKER_VERSION = "24.0.6"
 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 ea8f4c5e..696eeaa7 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
@@ -35,11 +35,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  hack/make/.binary | 37 ++++++++-----------------------------
  1 file changed, 8 insertions(+), 29 deletions(-)
 
-diff --git a/hack/make/.binary b/hack/make/.binary
-index 39c00cd50c..de32ad1cc7 100644
---- a/hack/make/.binary
-+++ b/hack/make/.binary
-@@ -3,7 +3,7 @@ set -e
+Index: import/hack/make/.binary
+===================================================================
+--- import.orig/hack/make/.binary
++++ import/hack/make/.binary
+@@ -3,7 +3,7 @@
  
  # a helper to provide ".exe" when it's appropriate
  binary_extension() {
@@ -48,7 +48,7 @@ index 39c00cd50c..de32ad1cc7 100644
                 echo -n '.exe'
         fi
  }
-@@ -16,33 +16,12 @@ source "${MAKEDIR}/.go-autogen"
+@@ -16,33 +16,12 @@
  (
         export GOGC=${DOCKER_BUILD_GOGC:-1000}
  
@@ -83,7 +83,7 @@ index 39c00cd50c..de32ad1cc7 100644
                                 windows/arm64 | linux/mips* | linux/ppc64) ;;
                                 *)
                                         BUILDFLAGS+=("-buildmode=pie")
-@@ -54,11 +33,11 @@ source "${MAKEDIR}/.go-autogen"
+@@ -66,11 +45,11 @@
         # only necessary for non-sandboxed invocation where TARGETPLATFORM is empty
         PLATFORM_NAME=$TARGETPLATFORM
         if [ -z "$PLATFORM_NAME" ]; then
@@ -100,12 +100,12 @@ index 39c00cd50c..de32ad1cc7 100644
                 fi
         fi
  
-@@ -66,7 +45,7 @@ source "${MAKEDIR}/.go-autogen"
+@@ -78,7 +57,7 @@
         if [ -n "$DOCKER_DEBUG" ]; then
                 set -x
         fi
--       go build -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" ${GO_PACKAGE}
-+       ${GO} build -trimpath -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" ${GO_PACKAGE}
+-       ./hack/with-go-mod.sh go build -mod=vendor -modfile=vendor.mod -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" "$GO_PACKAGE"
++       ./hack/with-go-mod.sh ${GO} build -trimpath -mod=vendor -modfile=vendor.mod -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" "$GO_PACKAGE"
  )
  
  echo "Created binary: $DEST/$BINARY_FULLNAME"