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

Merge branch 'master' into 1.28.x

Browse Source
This commit is contained in:
aiordache 2021-02-25 18:31:11 +01:00
commit 665efeed42
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/cli/main.py
View File

@ -1482,7 +1482,7 @@ def log_printer_from_project(
keep_prefix=True, keep_prefix=True,
): ):
return LogPrinter( return LogPrinter(
containers, [c for c in containers if c.log_driver not in (None, 'none')],
build_log_presenters(project.service_names, monochrome, keep_prefix), build_log_presenters(project.service_names, monochrome, keep_prefix),
event_stream or project.events(), event_stream or project.events(),
cascade_stop=cascade_stop, cascade_stop=cascade_stop,

6
compose/project.py
View File

@ -490,8 +490,6 @@ class Project:
log.info('%s uses an image, skipping' % service.name) log.info('%s uses an image, skipping' % service.name)
if cli: if cli:
log.info("Building with native build. Learn about native build in Compose here: "
"https://docs.docker.com/go/compose-native-build/")
if parallel_build: if parallel_build:
log.warning("Flag '--parallel' is ignored when building with " log.warning("Flag '--parallel' is ignored when building with "
"COMPOSE_DOCKER_CLI_BUILD=1") "COMPOSE_DOCKER_CLI_BUILD=1")
@ -651,10 +649,6 @@ class Project:
override_options=None, override_options=None,
): ):
if cli:
log.info("Building with native build. Learn about native build in Compose here: "
"https://docs.docker.com/go/compose-native-build/")
self.initialize() self.initialize()
if not ignore_orphans: if not ignore_orphans:
self.find_orphan_containers(remove_orphans) self.find_orphan_containers(remove_orphans)

7
compose/service.py
View File

@ -1873,6 +1873,13 @@ class _CLIBuilder:
command_builder.add_arg("--tag", tag) command_builder.add_arg("--tag", tag)
command_builder.add_arg("--target", target) command_builder.add_arg("--target", target)
command_builder.add_arg("--iidfile", iidfile) command_builder.add_arg("--iidfile", iidfile)
command_builder.add_arg("--platform", platform)
command_builder.add_arg("--isolation", isolation)
if extra_hosts:
for host, ip in extra_hosts.items():
command_builder.add_arg("--add-host", "{}:{}".format(host, ip))
args = command_builder.build([path]) args = command_builder.build([path])
magic_word = "Successfully built " magic_word = "Successfully built "

2
requirements.txt
View File

@ -4,7 +4,7 @@ certifi==2020.6.20
chardet==3.0.4 chardet==3.0.4
colorama==0.4.3; sys_platform == 'win32' colorama==0.4.3; sys_platform == 'win32'
distro==1.5.0 distro==1.5.0
docker==4.4.3 docker==4.4.4
docker-pycreds==0.4.0 docker-pycreds==0.4.0
dockerpty==0.4.1 dockerpty==0.4.1
docopt==0.6.2 docopt==0.6.2

2
setup.py
View File

@ -32,7 +32,7 @@ install_requires = [
'texttable >= 0.9.0, < 2', 'texttable >= 0.9.0, < 2',
'websocket-client >= 0.32.0, < 1', 'websocket-client >= 0.32.0, < 1',
'distro >= 1.5.0, < 2', 'distro >= 1.5.0, < 2',
'docker[ssh] >= 4.4.3, < 5', 'docker[ssh] >= 4.4.4, < 5',
'dockerpty >= 0.4.1, < 1', 'dockerpty >= 0.4.1, < 1',
'jsonschema >= 2.5.1, < 4', 'jsonschema >= 2.5.1, < 4',
'python-dotenv >= 0.13.0, < 1', 'python-dotenv >= 0.13.0, < 1',