From c2653b0a9ed4b371342fc2019c56d9433197171e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 7 Jul 2014 10:50:48 -0600 Subject: [PATCH] Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set If "DOCKER_HOST" is set, we can usually assume the user is connecting to a remote Docker and thus not bind mount anything by default (meaning the Makefile will more often DWIM for our users). Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2d07b39c3b..444ac3c6a6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ .PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli validate # to allow `make BINDDIR=. shell` or `make BINDDIR= test` -BINDDIR := bundles +# (default to no bind mount if DOCKER_HOST is set) +BINDDIR := $(if $(DOCKER_HOST),,bundles) # to allow `make DOCSPORT=9000 docs` DOCSPORT := 8000