From bd24eb07b6c3a9448d8b4a8b3ab0d9cd60995aaa Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 28 Mar 2014 18:40:16 -0700 Subject: [PATCH] Add $BINDIR to allow mounting the whole sources if needed (for development) Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes (github: creack) --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b3bea8a31f..717e73cb1a 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,12 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) DOCKER_IMAGE := docker:$(GIT_BRANCH) DOCKER_DOCS_IMAGE := docker-docs:$(GIT_BRANCH) -DOCKER_RUN_DOCKER := docker run --rm -i -t --privileged -e TESTFLAGS -v "$(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles" "$(DOCKER_IMAGE)" + +# to allow `make BINDDIR=. shell` +BINDDIR := bundles + +DOCKER_RUN_DOCKER := docker run --rm -i -t --privileged -e TESTFLAGS -v "$(CURDIR)/$(BINDDIR):/go/src/github.com/dotcloud/docker/$(BINDDIR)" "$(DOCKER_IMAGE)" + default: binary