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 #4528 from shin-/4430-divergent-scale 

Check for divergent containers when scaling up
This commit is contained in:
Joffrey F 2017-02-24 17:50:34 -08:00 committed by GitHub
parent 7e8dcc847b 3621787a74
commit a953651597
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compose/service.py
View File

@ -226,9 +226,20 @@ class Service(object):
if num_running != len(all_containers):
# we have some stopped containers, let's start them up again
stopped_containers = [
c for c in all_containers if not c.is_running
]
# Remove containers that have diverged
divergent_containers = [
c for c in stopped_containers if self._containers_have_diverged([c])
]
stopped_containers = sorted(
(c for c in all_containers if not c.is_running),
key=attrgetter('number'))
set(stopped_containers) - set(divergent_containers),
key=attrgetter('number')
)
for c in divergent_containers:
c.remove()
num_stopped = len(stopped_containers)