From 2cc2bc1acf8d132c1d88d763c67b82bdb87cb886 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 15 Apr 2021 17:10:26 -0400 Subject: 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 --- ...001-build-use-build-script-without-docker.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch (limited to 'recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch') diff --git a/recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch b/recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch new file mode 100644 index 00000000..070ebd63 --- /dev/null +++ b/recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch @@ -0,0 +1,26 @@ +From 45d03c7b04353d2e5955e573bc1063fcb0647a0c Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Thu, 15 Apr 2021 16:30:37 -0400 +Subject: [PATCH] build: use build script without docker + +Signed-off-by: Bruce Ashfield +--- + git/src/import/components/cli/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git git/src/import/components/cli/Makefile git/src/import/components/cli/Makefile +index 9e62210c33..9c7631f674 100644 +--- git/src/import/components/cli/Makefile ++++ git/src/import/components/cli/Makefile +@@ -51,7 +51,7 @@ plugins-osx: ## build example CLI plugins for macOS + + .PHONY: dynbinary + dynbinary: ## build dynamically linked binary +- USE_GLIBC=1 docker buildx bake dynbinary ++ GO_LINKMODE=dynamic ./scripts/build/binary + + vendor: vendor.conf ## check that vendor matches vendor.conf + rm -rf vendor +-- +2.19.1 + -- cgit v1.2.3-54-g00ecf