docker-ce: update to v20.10-beta

moby has moved on to the 20.10+ series, while docker-ce has
stayed behind a bit.

Master of docker-ce now has imports from moby and is getting
ready for release.

To keep our variants from diverging, we switch to master (for
now) and will track the new development.

We adapt some patches from the moby build to work for docker-ce,
in particular, we cannot use docker to build docker, so we
port the cli building from moby.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 12 insertions, 15 deletions

diff --git a/recipes-containers/docker/docker-ce/0001-dynbinary-use-go-cross-compiler.patch b/recipes-containers/docker/docker-ce/0001-dynbinary-use-go-cross-compiler.patch
index c11c6e6a..f198b4ed 100644
--- a/recipes-containers/docker/docker-ce/0001-dynbinary-use-go-cross-compiler.patch
+++ b/recipes-containers/docker/docker-ce/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/components/engine/hack/make/.binary b/src/import/components/engine/hack/make/.binary
-index 53de6749e5..47ab2a754f 100644
---- a/src/import/components/engine/hack/make/.binary
-+++ b/src/import/components/engine/hack/make/.binary
-@@ -81,7 +81,7 @@ esac
+Index: git/src/import/components/engine/hack/make/.binary
+===================================================================
+--- git.orig/src/import/components/engine/hack/make/.binary
++++ git/src/import/components/engine/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 "