Merge pull request #1565 from aanand/use-docker-1.7.0

Use docker 1.7.0 and docker-py 1.2.3
(cherry picked from commit 8ffeaf2a54)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	Dockerfile
This commit is contained in:
Aanand Prasad 2015-06-18 11:23:40 -07:00
commit c21d6706b6
3 changed files with 5 additions and 5 deletions

View file

@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==1.2.3-rc1
docker-py==1.2.3
dockerpty==0.3.4
docopt==0.6.1
requests==2.6.1