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

Merge pull request #2339 from dnephin/recreate_deps_on_create 

Recreate dependents when a dependency is created
This commit is contained in:
Aanand Prasad 2015-11-10 17:36:23 +00:00
parent c8fa0a902a 7c2a16234f
commit 0017f43d7f
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/project.py
View File

@ -322,7 +322,7 @@ class Project(object):
name name
for name in service.get_dependency_names() for name in service.get_dependency_names()
if name in plans if name in plans
and plans[name].action == 'recreate' and plans[name].action in ('recreate', 'create')
] ]
if updated_dependencies and strategy.allows_recreate: if updated_dependencies and strategy.allows_recreate:

13
tests/integration/state_test.py
View File

@ -176,6 +176,19 @@ class ProjectWithDependenciesTest(ProjectTestCase):
containers = self.run_up(next_cfg) containers = self.run_up(next_cfg)
self.assertEqual(len(containers), 2) self.assertEqual(len(containers), 2)
def test_service_recreated_when_dependency_created(self):
containers = self.run_up(self.cfg, service_names=['web'], start_deps=False)
self.assertEqual(len(containers), 1)
containers = self.run_up(self.cfg)
self.assertEqual(len(containers), 3)
web, = [c for c in containers if c.service == 'web']
nginx, = [c for c in containers if c.service == 'nginx']
self.assertEqual(web.links(), ['composetest_db_1', 'db', 'db_1'])
self.assertEqual(nginx.links(), ['composetest_web_1', 'web', 'web_1'])
class ServiceStateTest(DockerClientTestCase): class ServiceStateTest(DockerClientTestCase):
"""Test cases for Service.convergence_plan.""" """Test cases for Service.convergence_plan."""