Sfoglia il codice sorgente

Merge pull request #38847 from cpuguy83/enable_buildkit_for_build_target

Enable buildkit for Makefile build target
Vincent Demeester 6 anni fa
parent
commit
36d2c8b48e
1 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 2 1
      Makefile

+ 2 - 1
Makefile

@@ -134,9 +134,10 @@ binary: build ## build the linux binaries
 dynbinary: build ## build the linux dynbinaries
 dynbinary: build ## build the linux dynbinaries
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary
 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary
 
 
+build: DOCKER_BUILDKIT ?= 1
 build: bundles
 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})
 	$(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:
 bundles:
 	mkdir bundles
 	mkdir bundles