diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 21:11:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 21:11:28 +0000 |
| commit | 82578471aee6f6da57a537176e7e39c4d4b2f819 (patch) | |
| tree | 68c2c3efc1f0144b437a2d941a2df0157bb2076c | |
| parent | 0b671ad58d31dc3c3704a35a9ef0c17af0834e72 (diff) | |
| parent | ed3f541a6fdf8618055258c31704ae428a8093ed (diff) | |
| download | kolla-82578471aee6f6da57a537176e7e39c4d4b2f819.tar.gz kolla-82578471aee6f6da57a537176e7e39c4d4b2f819.zip | |
Merge "Updates Docker bin in Heat template"
| -rw-r--r-- | devenv/kollanode.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml index 22d1346b8..259406f5c 100644 --- a/devenv/kollanode.yaml +++ b/devenv/kollanode.yaml @@ -161,14 +161,15 @@ resources: # Install base packages yum -y install wget ntp git tcpdump python-pip - # Install Docker binaries - # TODO Use pkg when API 1.18 is available - wget https://master.dockerproject.com/linux/amd64/docker-1.5.0-dev -O docker - chmod +x docker + # 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-rc3 -o /docker + chmod +x /docker && cd / ./docker -d & # Install Compose with pid=host support # TODO: Use pkg when github.com/docker/compose/pull/1011 is merged + cd /root git clone http://github.com/sdake/fig cd fig pip install -e . |