Bläddra i källkod

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 <admwiggin@gmail.com> (github: tianon)
Tianon Gravi 11 år sedan
förälder
incheckning
c2653b0a9e
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      Makefile

+ 2 - 1
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
 .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`
 # 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`
 # to allow `make DOCSPORT=9000 docs`
 DOCSPORT := 8000
 DOCSPORT := 8000