docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2652 from kaustavha/kaustavha/fix/Makefile 

fix(Makefile): Prevent makefile from using containers when $USE_CONTAINERS=false
This commit is contained in:
Jean-Laurent de Morlhon 2015-12-22 09:57:17 +01:00
parent 5ee9dfdc94 302044858b
commit acf2d1da4c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@
ifneq (,$(findstring test-integration,$(MAKECMDGOALS))) ifneq (,$(findstring test-integration,$(MAKECMDGOALS)))
include Makefile.inc include Makefile.inc
include mk/main.mk include mk/main.mk
else ifeq ($(USE_CONTAINER),) else ifneq ($(USE_CONTAINER), true)
include Makefile.inc include Makefile.inc
include mk/main.mk include mk/main.mk
else else