3 files changed, 31 insertions, 26 deletions

diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb
index e94dfc2b..31f3ce9f 100644
--- a/recipes-containers/docker/docker-moby.bb
+++ b/recipes-containers/docker/docker-moby.bb
@@ -35,16 +35,16 @@ DESCRIPTION = "Linux container runtime \
 #     to a docker.inc recipe
 
 # moby commit matches the docker-engine bump on the 19.03 branch'
-SRCREV_moby = "11ecfe8a81b7040738333f777681e55e2a867160"
+SRCREV_moby = "8728dd246c3ab53105434eef8ffe997b6fd14dc6"
 SRCREV_libnetwork = "b3507428be5b458cb0e2b4086b13531fb0706e46"
-SRCREV_cli = "41b3ea7e472c504c1b7fe8e3347d329ab97b8112"
+SRCREV_cli = "370c28948e3c12dce3d1df60b6f184990618553f"
 SRC_URI = "\
         git://github.com/moby/moby.git;branch=20.10;name=moby \
         git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
         git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli \
         file://docker.init \
         file://0001-libnetwork-use-GO-instead-of-go.patch \
-        file://0001-cli-use-go-cross-compiler.patch \
+        file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \
         file://0001-dynbinary-use-go-cross-compiler.patch \
         "
 
@@ -58,7 +58,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "20.10.3"
+DOCKER_VERSION = "20.10.6"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
diff --git a/recipes-containers/docker/docker-moby/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch b/recipes-containers/docker/docker-moby/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
new file mode 100644
index 00000000..dc322612
--- /dev/null
+++ b/recipes-containers/docker/docker-moby/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
@@ -0,0 +1,27 @@
+From 650c882d3c53db118b01dd5e15fa1bc0ddaa36f1 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Thu, 15 Apr 2021 11:28:05 -0400
+Subject: [PATCH] cli: use external GO111MODULE and cross compiler
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ git/cli/scripts/build/binary | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git git/cli/scripts/build/binary git/cli/scripts/build/binary
+index e4c5e12a6b..7c47b75c2f 100755
+--- git/cli/scripts/build/binary
++++ git/cli/scripts/build/binary
+@@ -73,8 +73,7 @@ fi
+ 
+ echo "Building $GO_LINKMODE $(basename "${TARGET}")"
+ 
+-export GO111MODULE=auto
+ 
+-go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
++${GO} build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
+ 
+ ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker"
+-- 
+2.19.1
+
diff --git a/recipes-containers/docker/docker-moby/0001-cli-use-go-cross-compiler.patch b/recipes-containers/docker/docker-moby/0001-cli-use-go-cross-compiler.patch
deleted file mode 100644
index f065e184..00000000
--- a/recipes-containers/docker/docker-moby/0001-cli-use-go-cross-compiler.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ae6f4a1e685394fb7b9539f134b66ca84ddc91c2 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Tue, 30 Jun 2020 22:19:56 -0400
-Subject: [PATCH] cli: use go cross compiler
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- git/cli/scripts/build/dynbinary | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: git/cli/scripts/build/dynbinary
-===================================================================
---- git.orig/cli/scripts/build/dynbinary
-+++ git/cli/scripts/build/dynbinary
-@@ -19,6 +19,6 @@
-                 ;;
- esac
- 
--go build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
-+${GO} build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
- 
- ln -sf "$(basename "${TARGET}")" build/docker