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 #6381 from docker/incorrect_precreate_identifier 

Fix incorrect pre-create container name in up logs
This commit is contained in:
Joffrey F 2018-11-28 14:52:12 -08:00 committed by GitHub
parent 516eae0f5a a7894ddfea
commit dd927e0fdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compose/service.py
View File

@ -129,7 +129,7 @@ class NoSuchImageError(Exception):
pass pass
ServiceName = namedtuple('ServiceName', 'project service number slug') ServiceName = namedtuple('ServiceName', 'project service number')
ConvergencePlan = namedtuple('ConvergencePlan', 'action containers') ConvergencePlan = namedtuple('ConvergencePlan', 'action containers')
@ -447,13 +447,11 @@ class Service(object):
containers, errors = parallel_execute( containers, errors = parallel_execute(
[ [
ServiceName(self.project, self.name, index, generate_random_id()) ServiceName(self.project, self.name, index)
for index in range(i, i + scale) for index in range(i, i + scale)
], ],
lambda service_name: create_and_start(self, service_name.number), lambda service_name: create_and_start(self, service_name.number),
lambda service_name: self.get_container_name( lambda service_name: self.get_container_name(service_name.service, service_name.number),
service_name.service, service_name.number, service_name.slug
),
"Creating" "Creating"
) )
for error in errors.values(): for error in errors.values():