2 files changed, 9 insertions, 11 deletions

diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index 9f45f175..dfbfa706 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 = "43fc912ef59a83054ea7f6706df4d53a7dea4d80"
-SRCREV_cli = "d41cb083c352853f94b292a87df4859c4a96dcc2"
+SRCREV_moby = "bbd0a17ccc67e48d4a69393287b7fcc4f0578683"
+SRCREV_cli = "068a01ea9470df6494cc92d9e64e240805ae47a7"
 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 = "27.5.0-rc.2"
+DOCKER_VERSION = "28.0.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 160a3bca..9079d81e 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
@@ -48,7 +48,7 @@ Index: import/hack/make/.binary
                 echo -n '.exe'
         fi
  }
-@@ -16,33 +16,12 @@
+@@ -16,31 +16,10 @@
  (
         export GOGC=${DOCKER_BUILD_GOGC:-1000}
  
@@ -73,17 +73,15 @@ Index: import/hack/make/.binary
 -               fi
 -       fi
 -
-        # -buildmode=pie is not supported on Windows arm64 and Linux mips*, ppc64be
-        # https://github.com/golang/go/blob/go1.19.4/src/cmd/internal/sys/supported.go#L125-L132
         if ! [ "$DOCKER_STATIC" = "1" ]; then
                 # -buildmode=pie not supported when -race is enabled
                 if [[ " $BUILDFLAGS " != *" -race "* ]]; then
 -                       case "$(go env GOOS)/$(go env GOARCH)" in
 +                       case "$(${GO} env GOOS)/$(${GO} env GOARCH)" in
-                                windows/arm64 | linux/mips* | linux/ppc64) ;;
-                                *)
-                                        BUILDFLAGS+=("-buildmode=pie")
-@@ -66,11 +45,11 @@
+                                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 @@
         # only necessary for non-sandboxed invocation where TARGETPLATFORM is empty
         PLATFORM_NAME=$TARGETPLATFORM
         if [ -z "$PLATFORM_NAME" ]; then
@@ -100,7 +98,7 @@ Index: import/hack/make/.binary
                 fi
         fi
  
-@@ -82,7 +61,7 @@
+@@ -95,7 +74,7 @@
         if [ -n "$DOCKER_DEBUG" ]; then
                 set -x
         fi