tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-20 12:14:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6973 from glours/set_no_color_if_clicolor_defined_to_0

Browse Source 
Set no-colors to true if CLICOLOR env variable is set to 0
This commit is contained in:
Djordje Lukic 2019-10-31 16:45:10 +01:00 committed by GitHub
commit fa34ee7362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compose/cli/main.py
View File

@ -6,6 +6,7 @@ import contextlib
import functools import functools
import json import json
import logging import logging
import os
import pipes import pipes
import re import re
import subprocess import subprocess
@ -102,9 +103,9 @@ def dispatch():
options, handler, command_options = dispatcher.parse(sys.argv[1:]) options, handler, command_options = dispatcher.parse(sys.argv[1:])
setup_console_handler(console_handler, setup_console_handler(console_handler,
options.get('--verbose'), options.get('--verbose'),
options.get('--no-ansi'), set_no_color_if_clicolor(options.get('--no-ansi')),
options.get("--log-level")) options.get("--log-level"))
setup_parallel_logger(options.get('--no-ansi')) setup_parallel_logger(set_no_color_if_clicolor(options.get('--no-ansi')))
if options.get('--no-ansi'): if options.get('--no-ansi'):
command_options['--no-color'] = True command_options['--no-color'] = True
return functools.partial(perform_command, options, handler, command_options) return functools.partial(perform_command, options, handler, command_options)
@ -666,7 +667,7 @@ class TopLevelCommand(object):
log_printer_from_project( log_printer_from_project(
self.project, self.project,
containers, containers,
options['--no-color'], set_no_color_if_clicolor(options['--no-color']),
log_args, log_args,
event_stream=self.project.events(service_names=options['SERVICE'])).run() event_stream=self.project.events(service_names=options['SERVICE'])).run()
@ -1124,7 +1125,7 @@ class TopLevelCommand(object):
log_printer = log_printer_from_project( log_printer = log_printer_from_project(
self.project, self.project,
attached_containers, attached_containers,
options['--no-color'], set_no_color_if_clicolor(options['--no-color']),
{'follow': True}, {'follow': True},
cascade_stop, cascade_stop,
event_stream=self.project.events(service_names=service_names)) event_stream=self.project.events(service_names=service_names))
@ -1602,3 +1603,7 @@ def warn_for_swarm_mode(client):
"To deploy your application across the swarm, " "To deploy your application across the swarm, "
"use `docker stack deploy`.\n" "use `docker stack deploy`.\n"
) )
def set_no_color_if_clicolor(no_color_flag):
return no_color_flag or os.environ.get('CLICOLOR') == "0"