diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-11 19:33:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-11 19:33:09 +0000 |
| commit | 318f2f451f404276b975809d6dad86e869e5e773 (patch) | |
| tree | 8517a77c9fb5a0a0a9c38b49f9b9ccf1630dae6e /devenv | |
| parent | 23e1e524a4303e5fe48b935a8ee3bcc73f592b46 (diff) | |
| parent | fc3c30450429be230a5e992c314f6d318057b236 (diff) | |
| download | kolla-318f2f451f404276b975809d6dad86e869e5e773.tar.gz kolla-318f2f451f404276b975809d6dad86e869e5e773.zip | |
Merge "Change documentation to recommend Docker 1.7.0-dev"
Diffstat (limited to 'devenv')
| -rw-r--r-- | devenv/kollanode.yaml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml index e213ef3c2..1dee94903 100644 --- a/devenv/kollanode.yaml +++ b/devenv/kollanode.yaml @@ -161,9 +161,8 @@ resources: # Install base packages yum -y install wget ntp git tcpdump python-pip - # Install Docker from binaries due to: - # https://github.com/docker/docker/issues/11760#issuecomment-88288278 - curl https://fedorapeople.org/groups/heat/docker-1.6.0-rc5 -o /usr/local/sbin/docker + # Install Docker from binaries + curl -L https://master.dockerproject.com/linux/amd64/docker-1.7.0-dev -o /usr/local/sbin/docker chmod +x /usr/local/sbin/docker && cd /usr/local/sbin/ ./docker -d & |