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

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

Conflicts:
	tests/fixtures/simple-figfile/fig.yml
	tests/unit/project_test.py

tests/fixtures/links-figfile/fig.yml

@@ -1,11 +1,11 @@
 db:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300
 web:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300
   links:
     - db:db
 console:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300

tests/fixtures/longer-filename-figfile/fig.yaml

@@ -1,3 +1,3 @@
 definedinyamlnotyml:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300

tests/fixtures/multiple-figfiles/fig.yml

@@ -1,6 +1,6 @@
 simple:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300
 another:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300

tests/fixtures/multiple-figfiles/fig2.yml

@@ -1,3 +1,3 @@
 yetanother:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300

tests/fixtures/simple-dockerfile/Dockerfile

@@ -1,2 +1,2 @@
-FROM ubuntu
+FROM busybox:latest
 CMD echo "success"

tests/fixtures/simple-figfile/fig.yml

@@ -1,7 +1,7 @@
 simple:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300
 another:
   auto_start: false
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300