4 files changed, 18 insertions, 21 deletions

diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index 8910e2d3..3dc0e0d1 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 = "bbd0a17ccc67e48d4a69393287b7fcc4f0578683"
-SRCREV_cli = "068a01ea9470df6494cc92d9e64e240805ae47a7"
+SRCREV_moby = "e0183475e03cd05b6a560d8b22fe0a83cd1cba14"
+SRCREV_cli = "7cbee73f199c5846deaa474b0216fd3d709b9a07"
 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 = "28.0.1"
+DOCKER_VERSION = "28.3.0"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 CVE_PRODUCT = "docker mobyproject:moby"
diff --git a/recipes-containers/docker/files/0001-check-config-make-CONFIG_MEMCG_SWAP-conditional.patch b/recipes-containers/docker/files/0001-check-config-make-CONFIG_MEMCG_SWAP-conditional.patch
index 30b1a7d8..95ba2225 100644
--- a/recipes-containers/docker/files/0001-check-config-make-CONFIG_MEMCG_SWAP-conditional.patch
+++ b/recipes-containers/docker/files/0001-check-config-make-CONFIG_MEMCG_SWAP-conditional.patch
@@ -36,11 +36,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  contrib/check-config.sh | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/contrib/check-config.sh b/contrib/check-config.sh
-index b9cc6bf87d..3124548d99 100755
---- a/contrib/check-config.sh
-+++ b/contrib/check-config.sh
-@@ -266,7 +266,9 @@ echo 'Optional Features:'
+Index: import/contrib/check-config.sh
+===================================================================
+--- import.orig/contrib/check-config.sh
++++ import/contrib/check-config.sh
+@@ -246,7 +246,9 @@ echo 'Optional Features:'
         check_flags CGROUP_PIDS
  }
  {
@@ -51,6 +51,3 @@ index b9cc6bf87d..3124548d99 100755
         # Kernel v5.8+ removes MEMCG_SWAP_ENABLED.
         if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 8 ]; then
                 CODE=${EXITCODE}
--- 
-2.39.2
-
diff --git a/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch b/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
index 26f5aad4..3f09ebf8 100644
--- a/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
+++ b/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
@@ -10,11 +10,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  git/cli/scripts/build/binary | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-Index: git/cli/scripts/build/binary
+Index: docker-moby-28.3.0+gite0183475e03cd05b6a560d8b22fe0a83cd1cba14/cli/scripts/build/binary
 ===================================================================
---- git.orig/cli/scripts/build/binary
-+++ git/cli/scripts/build/binary
-@@ -13,8 +13,6 @@
+--- docker-moby-28.3.0+gite0183475e03cd05b6a560d8b22fe0a83cd1cba14.orig/cli/scripts/build/binary
++++ docker-moby-28.3.0+gite0183475e03cd05b6a560d8b22fe0a83cd1cba14/cli/scripts/build/binary
+@@ -13,8 +13,6 @@ fi
  
  echo "Building $GO_LINKMODE $(basename "${TARGET}")"
  
@@ -23,7 +23,7 @@ Index: git/cli/scripts/build/binary
  if [ "$(go env GOOS)" = "windows" ]; then
    if [ ! -x "$(command -v goversioninfo)" ]; then
      >&2 echo "goversioninfo not found, skipping manifesting binary"
-@@ -24,6 +22,6 @@
+@@ -24,6 +22,6 @@ if [ "$(go env GOOS)" = "windows" ]; the
    fi
  fi
  
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 9079d81e..e3f20a3a 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 @@
+@@ -3,7 +3,7 @@ set -e
  
  # a helper to provide ".exe" when it's appropriate
  binary_extension() {
@@ -48,7 +48,7 @@ Index: import/hack/make/.binary
                 echo -n '.exe'
         fi
  }
-@@ -16,31 +16,10 @@
+@@ -16,31 +16,10 @@ source "${MAKEDIR}/.go-autogen"
  (
         export GOGC=${DOCKER_BUILD_GOGC:-1000}
  
@@ -80,8 +80,8 @@ Index: import/hack/make/.binary
 +                       case "$(${GO} env GOOS)/$(${GO} env GOARCH)" in
                                 linux/mips* | linux/ppc64)
                                         # -buildmode=pie is not supported on Linux mips*, ppc64be
-                                        # https://github.com/golang/go/blob/go1.23.0/src/internal/platform/supported.go#L189-L197
-@@ -67,11 +46,11 @@
+                                        # https://github.com/golang/go/blob/go1.24.3/src/internal/platform/supported.go#L188-L200
+@@ -67,11 +46,11 @@ source "${MAKEDIR}/.go-autogen"
         # 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 @@
+@@ -95,7 +74,7 @@ source "${MAKEDIR}/.go-autogen"
         if [ -n "$DOCKER_DEBUG" ]; then
                 set -x
         fi