Browse code

Merge pull request #4904 from creack/make_dev

Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted

Tianon Gravi authored on 2014/04/02 01:19:56
Showing 1 changed files
... ...
@@ -3,7 +3,12 @@
3 3
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
4 4
 DOCKER_IMAGE := docker:$(GIT_BRANCH)
5 5
 DOCKER_DOCS_IMAGE := docker-docs:$(GIT_BRANCH)
6
-DOCKER_RUN_DOCKER := docker run --rm -i -t --privileged -e TESTFLAGS -v "$(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles" "$(DOCKER_IMAGE)"
6
+
7
+# to allow `make BINDDIR=. shell`
8
+BINDDIR := bundles
9
+
10
+DOCKER_RUN_DOCKER := docker run --rm -i -t --privileged -e TESTFLAGS -v "$(CURDIR)/$(BINDDIR):/go/src/github.com/dotcloud/docker/$(BINDDIR)" "$(DOCKER_IMAGE)"
11
+
7 12
 
8 13
 default: binary
9 14