docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent c3c5d91c47
commit c21d6706b6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -48,13 +48,13 @@ RUN set -ex; \
rm -rf pip-7.0.1; \ rm -rf pip-7.0.1; \
rm pip-7.0.1.tar.gz rm pip-7.0.1.tar.gz
ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc2 ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0
RUN set -ex; \ RUN set -ex; \
curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \ curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
chmod +x /usr/local/bin/docker-1.6.0; \ chmod +x /usr/local/bin/docker-1.6.0; \
curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc2 -o /usr/local/bin/docker-1.7.0-rc2; \ curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0 -o /usr/local/bin/docker-1.7.0; \
chmod +x /usr/local/bin/docker-1.7.0-rc2 chmod +x /usr/local/bin/docker-1.7.0
# Set the default Docker to be run # Set the default Docker to be run
RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker

2
requirements.txt
View File

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

2
setup.py
View File

@ -30,7 +30,7 @@ install_requires = [
'requests >= 2.6.1, < 2.7', 'requests >= 2.6.1, < 2.7',
'texttable >= 0.8.1, < 0.9', 'texttable >= 0.8.1, < 0.9',
'websocket-client >= 0.11.0, < 1.0', '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', 'dockerpty >= 0.3.4, < 0.4',
'six >= 1.3.0, < 2', 'six >= 1.3.0, < 2',
] ]