Skip to content

Commit

Permalink
Merge pull request docker#2652 from kaustavha/kaustavha/fix/Makefile
Browse files Browse the repository at this point in the history
fix(Makefile): Prevent makefile from using containers when $USE_CONTAINERS=false
  • Loading branch information
jeanlaurent committed Dec 22, 2015
2 parents 5ee9dfd + 3020448 commit acf2d1d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ifneq (,$(findstring test-integration,$(MAKECMDGOALS)))
include Makefile.inc
include mk/main.mk
else ifeq ($(USE_CONTAINER),)
else ifneq ($(USE_CONTAINER), true)
include Makefile.inc
include mk/main.mk
else
Expand Down

0 comments on commit acf2d1d

Please sign in to comment.