mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Build docker incrementally by default
This speeds up docker build time drastically. It still possible to disable this by setting `DOCKER_INCREMENTAL_BUILD` to `0` (and this is what should be done on the CI). Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
parent
b6e1f11105
commit
2c342cff79
2 changed files with 5 additions and 2 deletions
5
Makefile
5
Makefile
|
@ -2,6 +2,9 @@
|
||||||
|
|
||||||
# set the graph driver as the current graphdriver if not set
|
# set the graph driver as the current graphdriver if not set
|
||||||
DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //'))
|
DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //'))
|
||||||
|
export DOCKER_GRAPHDRIVER
|
||||||
|
DOCKER_INCREMENTAL_BINARY := $(if $(DOCKER_INCREMENTAL_BINARY),$(DOCKER_INCREMENTAL_BINARY),1)
|
||||||
|
export DOCKER_INCREMENTAL_BINARY
|
||||||
|
|
||||||
# get OS/Arch of docker engine
|
# get OS/Arch of docker engine
|
||||||
DOCKER_OSARCH := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKER_ENGINE_OSARCH:-$$DOCKER_CLIENT_OSARCH}')
|
DOCKER_OSARCH := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKER_ENGINE_OSARCH:-$$DOCKER_CLIENT_OSARCH}')
|
||||||
|
@ -20,7 +23,7 @@ DOCKER_ENVS := \
|
||||||
-e DOCKER_DEBUG \
|
-e DOCKER_DEBUG \
|
||||||
-e DOCKER_EXPERIMENTAL \
|
-e DOCKER_EXPERIMENTAL \
|
||||||
-e DOCKER_GITCOMMIT \
|
-e DOCKER_GITCOMMIT \
|
||||||
-e DOCKER_GRAPHDRIVER=$(DOCKER_GRAPHDRIVER) \
|
-e DOCKER_GRAPHDRIVER \
|
||||||
-e DOCKER_INCREMENTAL_BINARY \
|
-e DOCKER_INCREMENTAL_BINARY \
|
||||||
-e DOCKER_PORT \
|
-e DOCKER_PORT \
|
||||||
-e DOCKER_REMAP_ROOT \
|
-e DOCKER_REMAP_ROOT \
|
||||||
|
|
|
@ -159,7 +159,7 @@ ORIG_BUILDFLAGS=( -tags "autogen netgo static_build sqlite_omit_load_extension $
|
||||||
# When $DOCKER_INCREMENTAL_BINARY is set in the environment, enable incremental
|
# When $DOCKER_INCREMENTAL_BINARY is set in the environment, enable incremental
|
||||||
# builds by installing dependent packages to the GOPATH.
|
# builds by installing dependent packages to the GOPATH.
|
||||||
REBUILD_FLAG="-a"
|
REBUILD_FLAG="-a"
|
||||||
if [ "$DOCKER_INCREMENTAL_BINARY" ]; then
|
if [ "$DOCKER_INCREMENTAL_BINARY" == "1" ] || [ "$DOCKER_INCREMENTAL_BINARY" == "true" ]; then
|
||||||
REBUILD_FLAG="-i"
|
REBUILD_FLAG="-i"
|
||||||
fi
|
fi
|
||||||
ORIG_BUILDFLAGS+=( $REBUILD_FLAG )
|
ORIG_BUILDFLAGS+=( $REBUILD_FLAG )
|
||||||
|
|
Loading…
Add table
Reference in a new issue