Merge pull request #4904 from creack/make_dev

Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
This commit is contained in:
Tianon Gravi 2014-04-01 10:19:56 -06:00
commit 527bb5e960
1 changed files with 6 additions and 1 deletions

View File

@ -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