tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 23:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Call TopLevelCommand's environment 'toplevel_environment'

Browse Source 
To help prevent confusion between the different meanings and sources
of "environment", rename the method that loads the environment from
the .env or --env-file (i.e. the one that applies at a project level)
to 'toplevel_environment'.

Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
This commit is contained in:
Klaas Hoekema 2019-07-11 22:28:18 -04:00
parent 99464d9c2b
commit 35eb40424c
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compose/cli/main.py
View File

@ -248,7 +248,7 @@ class TopLevelCommand(object):
return self.toplevel_options.get('--project-directory') or '.' return self.toplevel_options.get('--project-directory') or '.'
@property @property
def environment(self): def toplevel_environment(self):
environment_file = self.toplevel_options.get('--env-file') environment_file = self.toplevel_options.get('--env-file')
return Environment.from_env_file(self.project_dir, environment_file) return Environment.from_env_file(self.project_dir, environment_file)
@ -281,7 +281,7 @@ class TopLevelCommand(object):
'--build-arg is only supported when services are specified for API version < 1.25.' '--build-arg is only supported when services are specified for API version < 1.25.'
' Please use a Compose file version > 2.2 or specify which services to build.' ' Please use a Compose file version > 2.2 or specify which services to build.'
) )
build_args = resolve_build_args(build_args, self.environment) build_args = resolve_build_args(build_args, self.toplevel_environment)
self.project.build( self.project.build(
service_names=options['SERVICE'], service_names=options['SERVICE'],
@ -433,7 +433,7 @@ class TopLevelCommand(object):
-t, --timeout TIMEOUT Specify a shutdown timeout in seconds. -t, --timeout TIMEOUT Specify a shutdown timeout in seconds.
(default: 10) (default: 10)
""" """
ignore_orphans = self.environment.get_boolean('COMPOSE_IGNORE_ORPHANS') ignore_orphans = self.toplevel_environment.get_boolean('COMPOSE_IGNORE_ORPHANS')
if ignore_orphans and options['--remove-orphans']: if ignore_orphans and options['--remove-orphans']:
raise UserError("COMPOSE_IGNORE_ORPHANS and --remove-orphans cannot be combined.") raise UserError("COMPOSE_IGNORE_ORPHANS and --remove-orphans cannot be combined.")
@ -490,7 +490,7 @@ class TopLevelCommand(object):
not supported in API < 1.25) not supported in API < 1.25)
-w, --workdir DIR Path to workdir directory for this command. -w, --workdir DIR Path to workdir directory for this command.
""" """
use_cli = not self.environment.get_boolean('COMPOSE_INTERACTIVE_NO_CLI') use_cli = not self.toplevel_environment.get_boolean('COMPOSE_INTERACTIVE_NO_CLI')
index = int(options.get('--index')) index = int(options.get('--index'))
service = self.project.get_service(options['SERVICE']) service = self.project.get_service(options['SERVICE'])
detach = options.get('--detach') detach = options.get('--detach')
@ -513,7 +513,7 @@ class TopLevelCommand(object):
if IS_WINDOWS_PLATFORM or use_cli and not detach: if IS_WINDOWS_PLATFORM or use_cli and not detach:
sys.exit(call_docker( sys.exit(call_docker(
build_exec_command(options, container.id, command), build_exec_command(options, container.id, command),
self.toplevel_options, environment) self.toplevel_options, self.toplevel_environment)
) )
create_exec_options = { create_exec_options = {
@ -1062,7 +1062,7 @@ class TopLevelCommand(object):
if detached and (cascade_stop or exit_value_from): if detached and (cascade_stop or exit_value_from):
raise UserError("--abort-on-container-exit and -d cannot be combined.") raise UserError("--abort-on-container-exit and -d cannot be combined.")
ignore_orphans = self.environment.get_boolean('COMPOSE_IGNORE_ORPHANS') ignore_orphans = self.toplevel_environment.get_boolean('COMPOSE_IGNORE_ORPHANS')
if ignore_orphans and remove_orphans: if ignore_orphans and remove_orphans:
raise UserError("COMPOSE_IGNORE_ORPHANS and --remove-orphans cannot be combined.") raise UserError("COMPOSE_IGNORE_ORPHANS and --remove-orphans cannot be combined.")
@ -1355,8 +1355,9 @@ def run_one_off_container(container_options, project, service, options, toplevel
project.client.remove_container(container.id, force=True, v=True) project.client.remove_container(container.id, force=True, v=True)
environment_file = toplevel_options.get('--env-file') environment_file = toplevel_options.get('--env-file')
environment = Environment.from_env_file(project_dir, environment_file) toplevel_environment = Environment.from_env_file(project_dir, environment_file)
use_cli = not environment.get_boolean('COMPOSE_INTERACTIVE_NO_CLI') use_cli = not toplevel_environment.get_boolean('COMPOSE_INTERACTIVE_NO_CLI')
signals.set_signal_handler_to_shutdown() signals.set_signal_handler_to_shutdown()
signals.set_signal_handler_to_hang_up() signals.set_signal_handler_to_hang_up()
try: try:
@ -1365,7 +1366,7 @@ def run_one_off_container(container_options, project, service, options, toplevel
service.connect_container_to_networks(container, use_network_aliases) service.connect_container_to_networks(container, use_network_aliases)
exit_code = call_docker( exit_code = call_docker(
get_docker_start_call(container_options, container.id), get_docker_start_call(container_options, container.id),
toplevel_options, environment toplevel_options, toplevel_environment
) )
else: else:
operation = RunOperation( operation = RunOperation(