4 files changed, 27 insertions, 95 deletions

diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb
index 03f681a2..1427784f 100644
--- a/recipes-containers/docker/docker-moby.bb
+++ b/recipes-containers/docker/docker-moby.bb
@@ -35,16 +35,15 @@ DESCRIPTION = "Linux container runtime \
 #     to a docker.inc recipe
 
 # moby commit matches the docker-engine bump on the 19.03 branch'
-SRCREV_moby = "7d75c1d40d88ddef08653dbd611f41df42bdf087"
-SRCREV_libnetwork = "55e924b8a84231a065879156c0de95aefc5f5435"
-SRCREV_cli = "fd3371eb7df1adeceff5935cf3ade0576a0f48d5"
+SRCREV_moby = "11ecfe8a81b7040738333f777681e55e2a867160"
+SRCREV_libnetwork = "b3507428be5b458cb0e2b4086b13531fb0706e46"
+SRCREV_cli = "41b3ea7e472c504c1b7fe8e3347d329ab97b8112"
 SRC_URI = "\
-        git://github.com/moby/moby.git;branch=19.03;name=moby \
-        git://github.com/docker/libnetwork.git;branch=bump_19.03;name=libnetwork;destsuffix=git/libnetwork \
-        git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
+        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-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \
         file://0001-cli-use-go-cross-compiler.patch \
         file://0001-dynbinary-use-go-cross-compiler.patch \
         "
@@ -59,7 +58,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.14"
+DOCKER_VERSION = "20.10.3"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
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
index 9419d547..f065e184 100644
--- 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
@@ -8,18 +8,15 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  git/cli/scripts/build/dynbinary | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git git/cli/scripts/build/dynbinary git/cli/scripts/build/dynbinary
-index 4feb7e71d8..f990d0e040 100755
---- git/cli/scripts/build/dynbinary
+Index: git/cli/scripts/build/dynbinary
+===================================================================
+--- git.orig/cli/scripts/build/dynbinary
 +++ git/cli/scripts/build/dynbinary
-@@ -9,6 +9,6 @@ source ./scripts/build/.variables
+@@ -19,6 +19,6 @@
+                 ;;
+ esac
  
- echo "Building dynamically linked $TARGET"
- export CGO_ENABLED=1
--go build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" -buildmode=pie "${SOURCE}"
-+${GO}  build -o "${TARGET}" -tags pkcs11 --ldflags "${LDFLAGS}" -buildmode=pie "${SOURCE}"
+-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
--- 
-2.19.1
-
diff --git a/recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch b/recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch
index d9cdfb01..971c60d7 100644
--- a/recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch
+++ b/recipes-containers/docker/docker-moby/0001-dynbinary-use-go-cross-compiler.patch
@@ -8,19 +8,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  hack/make/.binary | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/import/hack/make/.binary b/src/import/hack/make/.binary
-index 53de6749e5..47ab2a754f 100644
---- a/src/import/hack/make/.binary
-+++ b/src/import/hack/make/.binary
-@@ -81,7 +81,7 @@ esac
+Index: git/src/import/hack/make/.binary
+===================================================================
+--- git.orig/src/import/hack/make/.binary
++++ git/src/import/hack/make/.binary
+@@ -81,7 +81,7 @@
  
- echo "Building: $DEST/$BINARY_FULLNAME"
- echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\""
--go build \
-+${GO} build \
-        -o "$DEST/$BINARY_FULLNAME" \
-        "${BUILDFLAGS[@]}" \
-        -ldflags "
--- 
-2.19.1
-
+        echo "Building: $DEST/$BINARY_FULLNAME"
+        echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\""
+-       go build \
++       ${GO} build \
+                -o "$DEST/$BINARY_FULLNAME" \
+                "${BUILDFLAGS[@]}" \
+                -ldflags "
diff --git a/recipes-containers/docker/docker-moby/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch b/recipes-containers/docker/docker-moby/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch
deleted file mode 100644
index 766425a8..00000000
--- a/recipes-containers/docker/docker-moby/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 1263fdb50a540e9db742694b7cee08284ad986d0 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 17 Jul 2019 17:34:04 +0800
-Subject: [PATCH] imporve hardcoded CC on cross compile
-
-Since commit applied in moby [61a3285 Support cross-compile for arm]
-it hardcoded var-CC to support cross-compile for arm
-
-Correct it with "${parameter:-word}" format, it is helpful for user
-define toolchains
-
-(Use Default Values.  If parameter is unset or null, the expansion of
-word is substituted.  Otherwise, the value of parameter is substituted.)
-
-Upstream-Status: Submitted [https://github.com/moby/moby/pull/39546]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- components/engine/hack/make/.binary | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/import/hack/make/.binary b/src/import/hack/make/.binary
-index 53de6749e5..66f4ca05f3 100644
---- a/src/import/hack/make/.binary
-+++ b/src/import/hack/make/.binary
-@@ -44,27 +44,27 @@ if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARC
-        # must be cross-compiling!
-        case "$(go env GOOS)/$(go env GOARCH)" in
-                windows/amd64)
--                       export CC=x86_64-w64-mingw32-gcc
-+                       export CC="${CC:-x86_64-w64-mingw32-gcc}"
-                        export CGO_ENABLED=1
-                        ;;
-                linux/arm)
-                        case "${GOARM}" in
-                        5|"")
--                               export CC=arm-linux-gnueabi-gcc
-+                               export CC="${CC:-arm-linux-gnueabi-gcc}"
-                                export CGO_ENABLED=1
-                                ;;
-                        7)
--                               export CC=arm-linux-gnueabihf-gcc
-+                               export CC="${CC:-arm-linux-gnueabihf-gcc}"
-                                export CGO_ENABLED=1
-                                ;;
-                        esac
-                        ;;
-                linux/arm64)
--                       export CC=aarch64-linux-gnu-gcc
-+                       export CC="${CC:-aarch64-linux-gnu-gcc}"
-                        export CGO_ENABLED=1
-                        ;;
-                linux/amd64)
--                       export CC=x86_64-linux-gnu-gcc
-+                       export CC="${CC:-x86_64-linux-gnu-gcc}"
-                        export CGO_ENABLED=1
-                        ;;
-        esac
--- 
-2.23.0
-