Merge branch 'master' into 1.27.x

This commit is contained in:
aiordache 2020-09-10 17:59:55 +02:00
commit c5d32da9ad

View File

@ -1309,7 +1309,7 @@ def run_one_off_container(container_options, project, service, options, toplevel
service_names=[service.name], service_names=[service.name],
start_deps=not options['--no-deps'], start_deps=not options['--no-deps'],
strategy=ConvergenceStrategy.never, strategy=ConvergenceStrategy.never,
detached=detach, detached=True,
rescale=False, rescale=False,
cli=native_builder, cli=native_builder,
one_off=True, one_off=True,