summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-04-15 17:10:26 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-04-15 17:10:26 -0400
commit2cc2bc1acf8d132c1d88d763c67b82bdb87cb886 (patch)
treeff7c16e8dc59b6c3d7bd660e53c4ffc176befac8 /recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch
parent34087227ee6bf77eeed6b0728a8c3bb734a6ce35 (diff)
downloadmeta-virtualization-2cc2bc1acf8d132c1d88d763c67b82bdb87cb886.tar.gz
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>
Diffstat (limited to 'recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch')
-rw-r--r--recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch26
1 files changed, 26 insertions, 0 deletions
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 @@
1From 45d03c7b04353d2e5955e573bc1063fcb0647a0c Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Thu, 15 Apr 2021 16:30:37 -0400
4Subject: [PATCH] build: use build script without docker
5
6Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
7---
8 git/src/import/components/cli/Makefile | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git git/src/import/components/cli/Makefile git/src/import/components/cli/Makefile
12index 9e62210c33..9c7631f674 100644
13--- git/src/import/components/cli/Makefile
14+++ git/src/import/components/cli/Makefile
15@@ -51,7 +51,7 @@ plugins-osx: ## build example CLI plugins for macOS
16
17 .PHONY: dynbinary
18 dynbinary: ## build dynamically linked binary
19- USE_GLIBC=1 docker buildx bake dynbinary
20+ GO_LINKMODE=dynamic ./scripts/build/binary
21
22 vendor: vendor.conf ## check that vendor matches vendor.conf
23 rm -rf vendor
24--
252.19.1
26