docker-ce: update to 20.10.6

Updating docker-ce to 20.10.6, we also restructure the recipe to build
as mentioned in: https://github.com/docker/docker-ce

This now makes the docker-ce recipe virtually identical to the moby
variant, with only SRCREV differences being signficant. The docker-ce
recipe will build the tags as identified by the docker-packaging
repository.

We keep this as a separate recipe for this update, so we can backport
the 20.10.6 change to older branches (for CVEs, etc), but the moby
and docker-ce recipes will (re)unify in following updates.

  root@qemux86-64:~# docker --version
  Docker version 20.10.6-ce, build 370c28948e
  root@qemux86-64:~# docker pull alpine
  Using default tag: latest
  latest: Pulling from library/alpine
  540db60ca938: Pull complete
  Digest:
  sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f
  Status: Downloaded newer image for alpine:latest
  docker.io/library/alpine:latest
  root@qemux86-64:~# docker run -it alpine /bin/sh
  [ 4099.428945] docker0: port 1(veth33cc29a) entered blocking state
  [ 4099.430548] docker0: port 1(veth33cc29a) entered disabled state
  [ 4099.434641] device veth33cc29a entered promiscuous mode
  [ 4100.219415] cgroup: cgroup: disabling cgroup2 socket matching due to net_prio or net_cls activation
  [ 4100.739037] eth0: renamed from vethe948f63
  [ 4100.746450] IPv6: ADDRCONF(NETDEV_CHANGE): veth33cc29a: link becomes ready
  [ 4100.748508] docker0: port 1(veth33cc29a) entered blocking state
  [ 4100.750150] docker0: port 1(veth33cc29a) entered forwarding state
  [ 4100.754370] IPv6: ADDRCONF(NETDEV_CHANGE): docker0: link becomes ready
  / # cat /etc/issue
  Welcome to Alpine Linux 3.13
  Kernel \r on an \m (\l)

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

1 files changed, 4 insertions, 4 deletions

diff --git a/recipes-containers/docker/docker-ce/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch b/recipes-containers/docker/docker-ce/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
index c4560d8a..dc322612 100644
--- a/recipes-containers/docker/docker-ce/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
+++ b/recipes-containers/docker/docker-ce/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] cli: use external GO111MODULE and cross compiler
 
 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
 ---
- git/src/import/components/cli/scripts/build/binary | 3 +--
+ git/cli/scripts/build/binary | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git git/src/import/components/cli/scripts/build/binary git/src/import/components/cli/scripts/build/binary
+diff --git git/cli/scripts/build/binary git/cli/scripts/build/binary
 index e4c5e12a6b..7c47b75c2f 100755
---- git/src/import/components/cli/scripts/build/binary
-+++ git/src/import/components/cli/scripts/build/binary
+--- git/cli/scripts/build/binary
++++ git/cli/scripts/build/binary
 @@ -73,8 +73,7 @@ fi
  
  echo "Building $GO_LINKMODE $(basename "${TARGET}")"