From 03606b8a85c62670ed3b0329472e4fa169a6a0c5 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Fri, 20 Mar 2015 23:22:54 -0700
Subject: [PATCH] Improve developer docs around docker-compose and docker-dev
docker-compose master now requires 1.18 API, which is only available
in the development version of docker. Show how to retrieve and run it.
Change-Id: Ia3a7a659c495547fcc04d31cf38ffeaaf6fd729a
---
docs/developer-env.md | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/docs/developer-env.md b/docs/developer-env.md
index e85cb45ee1..a1ba772a33 100644
--- a/docs/developer-env.md
+++ b/docs/developer-env.md
@@ -2,16 +2,32 @@
In order to run Kolla, it is mandatory to run a version of
`docker-compose` that includes pid: host support. One of the
-authors of kolla has a pull request outstanding that the
+authors of Kolla has a pull request outstanding that the
docker-compose maintainers have said they would merge shortly.
-It must be retrieved via git and installed:
+The pull request is:
+
+ https://github.com/docker/compose/pull/1011
+
+Until then, it must be retrieved via git and installed:
git pull http://github.com/sdake/fig
cd fig
sudo pip install .
sudo pip install -U docker-py
+The docker-compose version available via the sdake repository has been
+rebased on to a master version of docker-compose which requires the
+docker API 1.18. the docker API 1.18 is not available in distro
+packaging and is only available by building from source. Docker also
+distributes pre-built binaries for docker. It is recommended to just run
+the docker provided binaries rather then building from source:
+
+ sudo systemctl stop docker
+ sudo killall -9 docker
+ curl https://master.dockerproject.com/linux/amd64/docker-1.5.0-dev -o docker-dev
+ sudo ./docker-dev -d
+
The basic starting environment will be created using `docker-compose`.
This environment will start up the openstack services listed in the
compose directory.
--
GitLab