From e64cd6abed308a26d9048d4d0e4c52207c2ad5df Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Sat, 9 Mar 2019 18:27:26 -0800 Subject: [PATCH] Enable buildkit for Makefile build target This is set only if it is not already set. This should give a little speedup to CI builds. Signed-off-by: Brian Goff (cherry picked from commit 1275a001a68722494d090d5beca6749a83710cc2) Signed-off-by: Sebastiaan van Stijn --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 67f6c3dab1..e2539683e1 100644 --- a/Makefile +++ b/Makefile @@ -134,9 +134,10 @@ binary: build ## build the linux binaries dynbinary: build ## build the linux dynbinaries $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary +build: DOCKER_BUILDKIT ?= 1 build: bundles $(warning The docker client CLI has moved to github.com/docker/cli. For a dev-test cycle involving the CLI, run:${\n} DOCKER_CLI_PATH=/host/path/to/cli/binary make shell ${\n} then change the cli and compile into a binary at the same location.${\n}) - docker build ${BUILD_APT_MIRROR} ${DOCKER_BUILD_ARGS} ${DOCKER_BUILD_OPTS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" . + DOCKER_BUILDKIT="${DOCKER_BUILDKIT}" docker build ${BUILD_APT_MIRROR} ${DOCKER_BUILD_ARGS} ${DOCKER_BUILD_OPTS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" . bundles: mkdir bundles