jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -30,7 +30,7 @@ install_requires = [
'requests >= 2.6.1, < 2.7',
'texttable >= 0.8.1, < 0.9',
'websocket-client >= 0.11.0, < 1.0',
'docker-py >= 1.2.3-rc1, < 1.3',
'docker-py >= 1.2.3, < 1.3',
'dockerpty >= 0.3.4, < 0.4',
'six >= 1.3.0, < 2',
]