jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into feature/auto_start

Browse source 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>

Conflicts:
	tests/fixtures/simple-figfile/fig.yml
	tests/unit/project_test.py
This commit is contained in:
Chris Corbyn 2014-06-12 22:05:51 +00:00
commit 1b5bf6e12a
10 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/install.md
View file

@ -6,9 +6,9 @@ title: Installing Fig
Installing Fig
==============
First, install Docker version 0.11.1. If you're on OS X, you can use [docker-osx](https://github.com/noplay/docker-osx):
First, install Docker version 1.0.0. If you're on OS X, you can use [docker-osx](https://github.com/noplay/docker-osx):
$ curl https://raw.githubusercontent.com/noplay/docker-osx/0.11.1/docker-osx > /usr/local/bin/docker-osx
$ curl https://raw.githubusercontent.com/noplay/docker-osx/1.0.0/docker-osx > /usr/local/bin/docker-osx
$ chmod +x /usr/local/bin/docker-osx
$ docker-osx shell