From 614a254bf2da5ab8ed898f693c95a49fbceed470 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 29 Apr 2021 12:58:59 -0400 Subject: 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 --- .../0001-cli-use-external-GO111MODULE-and-cross-compiler.patch | 8 ++++---- .../docker/docker-ce/0001-dynbinary-use-go-cross-compiler.patch | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'recipes-containers/docker/docker-ce') 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 --- - 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}")" 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 f198b4ed..971c60d7 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,10 +8,10 @@ Signed-off-by: Bruce Ashfield hack/make/.binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/src/import/components/engine/hack/make/.binary +Index: git/src/import/hack/make/.binary =================================================================== ---- git.orig/src/import/components/engine/hack/make/.binary -+++ git/src/import/components/engine/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" -- cgit v1.2.3-54-g00ecf