tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Chris Corbyn 2014-06-12 22:05:51 +00:00
parent 6e485df084 e953a32a82
commit 1b5bf6e12a
10 changed files with 31 additions and 31 deletions
Show Stats 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

6
tests/fixtures/links-figfile/fig.yml vendored
View File

@ -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

2
tests/fixtures/longer-filename-figfile/fig.yaml vendored
View File

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

4
tests/fixtures/multiple-figfiles/fig.yml vendored
View File

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

2
tests/fixtures/multiple-figfiles/fig2.yml vendored
View File

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

2
tests/fixtures/simple-dockerfile/Dockerfile vendored
View File

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

4
tests/fixtures/simple-figfile/fig.yml vendored
View File

@ -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

4
tests/integration/testcases.py
View File

@ -10,7 +10,7 @@ class DockerClientTestCase(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.client = Client(docker_url())
cls.client.pull('ubuntu', tag='latest')
cls.client.pull('busybox', tag='latest')
def setUp(self):
for c in self.client.containers(all=True):
@ -28,7 +28,7 @@ class DockerClientTestCase(unittest.TestCase):
project='figtest',
name=name,
client=self.client,
image="ubuntu",
image="busybox:latest",
**kwargs
)

10
tests/unit/container_test.py
View File

@ -6,7 +6,7 @@ class ContainerTest(unittest.TestCase):
def test_from_ps(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Created":1387384730,
"Status":"Up 8 seconds",
@ -17,7 +17,7 @@ class ContainerTest(unittest.TestCase):
}, has_been_inspected=True)
self.assertEqual(container.dictionary, {
"ID": "abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Name": "/figtest_db_1",
})
@ -39,7 +39,7 @@ class ContainerTest(unittest.TestCase):
def test_number(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Created":1387384730,
"Status":"Up 8 seconds",
@ -53,7 +53,7 @@ class ContainerTest(unittest.TestCase):
def test_name(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Names":["/figtest_db_1"]
}, has_been_inspected=True)
@ -62,7 +62,7 @@ class ContainerTest(unittest.TestCase):
def test_name_without_project(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Names":["/figtest_db_1"]
}, has_been_inspected=True)

24
tests/unit/project_test.py
View File

@ -8,29 +8,29 @@ class ProjectTest(unittest.TestCase):
project = Project.from_dicts('figtest', [
{
'name': 'web',
'image': 'ubuntu'
'image': 'busybox:latest'
},
{
'name': 'db',
'image': 'ubuntu'
'image': 'busybox:latest'
},
], None)
self.assertEqual(len(project.services), 2)
self.assertEqual(project.get_service('web').name, 'web')
self.assertEqual(project.get_service('web').options['image'], 'ubuntu')
self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
self.assertEqual(project.get_service('db').name, 'db')
self.assertEqual(project.get_service('db').options['image'], 'ubuntu')
self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
def test_from_dict_sorts_in_dependency_order(self):
project = Project.from_dicts('figtest', [
{
'name': 'web',
'image': 'ubuntu',
'image': 'busybox:latest',
'links': ['db'],
},
{
'name': 'db',
'image': 'ubuntu'
'image': 'busybox:latest'
}
], None)
@ -40,22 +40,22 @@ class ProjectTest(unittest.TestCase):
def test_from_config(self):
project = Project.from_config('figtest', {
'web': {
'image': 'ubuntu',
'image': 'busybox:latest',
},
'db': {
'image': 'ubuntu',
'image': 'busybox:latest',
},
}, None)
self.assertEqual(len(project.services), 2)
self.assertEqual(project.get_service('web').name, 'web')
self.assertEqual(project.get_service('web').options['image'], 'ubuntu')
self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
self.assertEqual(project.get_service('db').name, 'db')
self.assertEqual(project.get_service('db').options['image'], 'ubuntu')
self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
def test_from_config_throws_error_when_not_dict(self):
with self.assertRaises(ConfigurationError):
project = Project.from_config('figtest', {
'web': 'ubuntu',
'web': 'busybox:latest',
}, None)
def test_get_service(self):
@ -63,7 +63,7 @@ class ProjectTest(unittest.TestCase):
project='figtest',
name='web',
client=None,
image="ubuntu",
image="busybox:latest",
)
project = Project('test', [web], None)
self.assertEqual(project.get_service('web'), web)