|
@@ -3,7 +3,7 @@
|
|
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)"
|
|
|
|
|
|
+DOCKER_RUN_DOCKER := docker run --rm -i -t --privileged -e TESTFLAGS -v "$(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles" "$(DOCKER_IMAGE)"
|
|
|
|
|
|
default: binary
|
|
default: binary
|
|
|
|
|
|
@@ -17,10 +17,10 @@ cross: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross
|
|
|
|
|
|
docs: docs-build
|
|
docs: docs-build
|
|
- docker run -rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)"
|
|
|
|
|
|
+ docker run --rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)"
|
|
|
|
|
|
docs-shell: docs-build
|
|
docs-shell: docs-build
|
|
- docker run -rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)" bash
|
|
|
|
|
|
+ docker run --rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)" bash
|
|
|
|
|
|
test: build
|
|
test: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh test test-integration
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh test test-integration
|