summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2015-09-22 14:06:20 -0700
committerJoffrey F <f.joffrey@gmail.com>2015-09-22 14:06:20 -0700
commit8c270dfdf0dfe3d3768846742faa33862742150f (patch)
treebbef0cdcaaa73978d0fa15543aa0d67d8fa4949e /Makefile
parent50a33542c83e25d26cfb26cd2076bb447edf411d (diff)
parent72b8a295dbaa32a07e8f860fd7568c981b549b28 (diff)
downloaddocker-py-8c270dfdf0dfe3d3768846742faa33862742150f.tar.gz
Merge pull request #780 from docker/contributing
[WIP] Contributing guidelines
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 07bb63f..f98abe7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ build:
build-py3:
docker build -t docker-py3 -f Dockerfile-py3 .
-test: unit-test integration-test unit-test-py3 integration-test-py3
+test: flake8 unit-test unit-test-py3 integration-dind
unit-test: build
docker run docker-py py.test tests/test.py tests/utils_test.py
@@ -30,3 +30,6 @@ integration-dind: build build-py3
docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test -rxs tests/integration_test.py
docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test -rxs tests/integration_test.py
docker rm -vf dpy-dind
+
+flake8: build
+ docker run docker-py flake8 docker tests \ No newline at end of file