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 #6996 from ajlai/fix-color-order-and-remove-red 

Make container service color deterministic, remove red from chosen colors
This commit is contained in:
Jean-Christophe Sirot 2019-11-06 16:11:57 +01:00 committed by GitHub
parent fa34ee7362 802fa20228
commit abef11b2a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/cli/colors.py
View File

@ -41,9 +41,9 @@ for (name, code) in get_pairs():
def rainbow(): def rainbow():
cs = ['cyan', 'yellow', 'green', 'magenta', 'red', 'blue', cs = ['cyan', 'yellow', 'green', 'magenta', 'blue',
'intense_cyan', 'intense_yellow', 'intense_green', 'intense_cyan', 'intense_yellow', 'intense_green',
'intense_magenta', 'intense_red', 'intense_blue'] 'intense_magenta', 'intense_blue']
for c in cs: for c in cs:
yield globals()[c] yield globals()[c]

5
compose/cli/log_printer.py
View File

@ -134,7 +134,10 @@ def build_thread(container, presenter, queue, log_args):
def build_thread_map(initial_containers, presenters, thread_args): def build_thread_map(initial_containers, presenters, thread_args):
return { return {
container.id: build_thread(container, next(presenters), *thread_args) container.id: build_thread(container, next(presenters), *thread_args)
for container in initial_containers # Container order is unspecified, so they are sorted by name in order to make
# container:presenter (log color) assignment deterministic when given a list of containers
# with the same names.
for container in sorted(initial_containers, key=lambda c: c.name)
} }