|
@@ -3,7 +3,12 @@
|
|
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
|
|
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
|
|
DOCKER_IMAGE := docker:$(GIT_BRANCH)
|
|
DOCKER_IMAGE := docker:$(GIT_BRANCH)
|
|
DOCKER_DOCS_IMAGE := docker-docs:$(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
|
|
default: binary
|
|
|
|
|