summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2016-09-14 14:06:52 -0700
committerGitHub <noreply@github.com>2016-09-14 14:06:52 -0700
commit48b7835a9204f2d7fdaa1a97a9aef08b1017a832 (patch)
treeb68f75d3726f80368cd8373748430dc4c10e11f1
parent230bc18bfdcebd34c7d6b1f263dc724e5f166036 (diff)
parent71b0b7761a42464663d798a09b6f6adf6ad1a52d (diff)
downloaddocker-py-48b7835a9204f2d7fdaa1a97a9aef08b1017a832.tar.gz
Merge pull request #1216 from bfirsh/makefile-improvements
Makefile improvements
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1fb21d4..b997722 100644
--- a/Makefile
+++ b/Makefile
@@ -35,11 +35,11 @@ unit-test-py3: build-py3
.PHONY: integration-test
integration-test: build
- docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py py.test tests/integration
+ docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py py.test tests/integration/${file}
.PHONY: integration-test-py3
integration-test-py3: build-py3
- docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration
+ docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration/${file}
.PHONY: integration-dind
integration-dind: build build-py3
@@ -75,3 +75,7 @@ flake8: build
.PHONY: docs
docs: build-docs
docker run -v `pwd`/docs:/home/docker-py/docs/ -p 8000:8000 docker-py-docs mkdocs serve -a 0.0.0.0:8000
+
+.PHONY: shell
+shell: build
+ docker run -it -v /var/run/docker.sock:/var/run/docker.sock docker-py python