diff options
| author | hayderimran7 <imran@cloudscaling.com> | 2015-06-22 23:31:15 -0700 |
|---|---|---|
| committer | hayderimran7 <imran@cloudscaling.com> | 2015-06-23 00:02:03 -0700 |
| commit | 4f6a49769e3994d78844d702a70d10fd8fb9c15a (patch) | |
| tree | 021755dfe20d1c298ce3324f0b3dc98e34f950f4 | |
| parent | 64f23c1d133fea984a88f4487fe44d088b3419b1 (diff) | |
| download | kolla-4f6a49769e3994d78844d702a70d10fd8fb9c15a.tar.gz kolla-4f6a49769e3994d78844d702a70d10fd8fb9c15a.zip | |
Fix docker-1.7.0 binary download link
The download link is fixed and updated to use docker-1.7.0
from https://get.docker.com instead of https://master.dockerproject.com
because later one only holds latest docker bin which is 1.8.0,
and get.docker.io is also the official way of getting docker binary
as mentioned in docker install docs.Also fixed the docs to point
that 1.7.0 is minimum version required for docker.
Closes-bug: 1467767
Change-Id: I7770295271499275f937be3c2feab7216a30a388
| -rw-r--r-- | devenv/README.md | 11 | ||||
| -rw-r--r-- | devenv/kollanode.yaml | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/devenv/README.md b/devenv/README.md index ab9f10cbc..000bbd071 100644 --- a/devenv/README.md +++ b/devenv/README.md @@ -17,15 +17,8 @@ networking has a configuration similar to: Sharing pid and networking namespaces is detailed in the [super privileged containers][] concept. -The Kolla cluster is based on Fedora 21, requires the Docker 1.5.0-dev -[binary][] and runs a newer version of `docker-compose` that includes -pid: host support. One of the authors of Kolla has a pull request -outstanding that the docker-compose maintainers have said they -would merge shortly. - -The pull request is: - - https://github.com/docker/compose/pull/1011 +The Kolla cluster is based on Fedora 21, requires the minimum Docker version of 1.7.0 +[binary][]. These templates are designed to work with the Icehouse or Juno versions of Heat. If using Icehouse Heat, this [patch][] is diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml index 4ec9d19ed..b3d39a236 100644 --- a/devenv/kollanode.yaml +++ b/devenv/kollanode.yaml @@ -162,7 +162,7 @@ resources: yum -y install wget ntp git tcpdump python-pip python-devel # Install Docker from binaries - curl -L https://master.dockerproject.com/linux/amd64/docker-1.7.0-dev -o /usr/local/sbin/docker + curl -L https://get.docker.com/builds/Linux/x86_64/docker-1.7.0 -o /usr/local/sbin/docker chmod +x /usr/local/sbin/docker && cd /usr/local/sbin/ ./docker -d & |