Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
| ... | ... |
@@ -3,7 +3,7 @@ |
| 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 |
+DOCKER_RUN_DOCKER := docker run --rm -i -t --privileged -e TESTFLAGS -v "$(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles" "$(DOCKER_IMAGE)" |
|
| 7 | 7 |
|
| 8 | 8 |
default: binary |
| 9 | 9 |
|
| ... | ... |
@@ -17,10 +17,10 @@ cross: build |
| 17 | 17 |
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross |
| 18 | 18 |
|
| 19 | 19 |
docs: docs-build |
| 20 |
- docker run -rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)" |
|
| 20 |
+ docker run --rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)" |
|
| 21 | 21 |
|
| 22 | 22 |
docs-shell: docs-build |
| 23 |
- docker run -rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)" bash |
|
| 23 |
+ docker run --rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)" bash |
|
| 24 | 24 |
|
| 25 | 25 |
test: build |
| 26 | 26 |
$(DOCKER_RUN_DOCKER) hack/make.sh test test-integration |