summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-07-22 11:34:36 -0700
committerJoffrey F <joffrey@docker.com>2015-07-22 11:34:36 -0700
commit5f0f085fc7fe7810d03a0534c92b2b5cf58da75c (patch)
tree00dae12df82d6e80583edb7230332f3212c1690d
parent81f65e924e5d25b44a5b3017c94b427007e9d3fe (diff)
downloaddocker-py-1.3.1-release.tar.gz
Updated Makefile to help with release testing1.3.1-release
-rw-r--r--Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cf291ea..ce74974 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all build test integration-test unit-test
+.PHONY: all build test integration-test unit-test build-py3 unit-test-py3 integration-test-py3
HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
@@ -7,10 +7,19 @@ all: test
build:
docker build -t docker-py .
-test: unit-test integration-test
+build-py3:
+ docker build -t docker-py3 -f Dockerfile-py3 .
+
+test: unit-test integration-test unit-test-py3 integration-test-py3
unit-test: build
docker run docker-py python tests/test.py
+unit-test-py3: build-py3
+ docker run docker-py3 python tests/test.py
+
integration-test: build
docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py
+
+integration-test-py3: build-py3
+ docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 python tests/integration_test.py