From 62bbc5cfe2ad15e4fbcbd2ef5e4834e2fa059fbd Mon Sep 17 00:00:00 2001 From: aiordache Date: Fri, 19 Feb 2021 09:54:39 +0100 Subject: [PATCH 1/6] Changelog update post-release 1.28.4 Signed-off-by: aiordache --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a00b5f4b2..3b9f0a96e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ Change log ========== +1.28.4 (2021-02-18) +------------------- + +[List of PRs / issues for this release](https://github.com/docker/compose/milestone/54?closed=1) + +### Bugs + +- Fix SSH port parsing by bumping docker-py to 4.4.3 + +### Miscellaneous + +- Bump Python to 3.7.10 + 1.28.3 (2021-02-17) ------------------- From 9c8f5a5705858e823976867e981d626b0874b5da Mon Sep 17 00:00:00 2001 From: aiordache Date: Tue, 23 Feb 2021 09:50:45 +0100 Subject: [PATCH 2/6] Set `platform` and `isolation` options for cli builder Signed-off-by: aiordache --- compose/service.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose/service.py b/compose/service.py index df0d76fb9..c3ee0201a 100644 --- a/compose/service.py +++ b/compose/service.py @@ -1873,6 +1873,8 @@ class _CLIBuilder: command_builder.add_arg("--tag", tag) command_builder.add_arg("--target", target) command_builder.add_arg("--iidfile", iidfile) + command_builder.add_arg("--platform", platform) + command_builder.add_arg("--isolation", isolation) args = command_builder.build([path]) magic_word = "Successfully built " From efa5969086386c76278cafdd164a0a6a29565238 Mon Sep 17 00:00:00 2001 From: aiordache Date: Wed, 24 Feb 2021 18:26:12 +0100 Subject: [PATCH 3/6] Bump docker-py version to 4.4.4 Signed-off-by: aiordache --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index fd3705041..a7f0e0279 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ certifi==2020.6.20 chardet==3.0.4 colorama==0.4.3; sys_platform == 'win32' distro==1.5.0 -docker==4.4.3 +docker==4.4.4 docker-pycreds==0.4.0 dockerpty==0.4.1 docopt==0.6.2 diff --git a/setup.py b/setup.py index 74012bf14..c58a1acc4 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ install_requires = [ 'texttable >= 0.9.0, < 2', 'websocket-client >= 0.32.0, < 1', 'distro >= 1.5.0, < 2', - 'docker[ssh] >= 4.4.3, < 5', + 'docker[ssh] >= 4.4.4, < 5', 'dockerpty >= 0.4.1, < 1', 'jsonschema >= 2.5.1, < 4', 'python-dotenv >= 0.13.0, < 1', From 2f48b6f5e97a5d701e6659f09b312ffd12543e71 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Thu, 25 Feb 2021 11:18:31 -0300 Subject: [PATCH 4/6] Remove log.info for native build Signed-off-by: Ulysses Souza --- compose/project.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/compose/project.py b/compose/project.py index 0f112c9c1..e862464d8 100644 --- a/compose/project.py +++ b/compose/project.py @@ -490,8 +490,6 @@ class Project: log.info('%s uses an image, skipping' % service.name) 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: log.warning("Flag '--parallel' is ignored when building with " "COMPOSE_DOCKER_CLI_BUILD=1") @@ -651,10 +649,6 @@ class Project: 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() if not ignore_orphans: self.find_orphan_containers(remove_orphans) From 72f7b086d757324e030bf9ec25b3f4cfe20b34ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rodrigues?= Date: Wed, 10 Feb 2021 15:52:11 +0100 Subject: [PATCH 5/6] Add missing --add-host args to the build command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Rodrigues --- compose/service.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compose/service.py b/compose/service.py index c3ee0201a..3829e8269 100644 --- a/compose/service.py +++ b/compose/service.py @@ -1875,6 +1875,11 @@ class _CLIBuilder: 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]) magic_word = "Successfully built " From 6ca2aed7ec106302ba8452d2f9ac923a9f5935dc Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Thu, 25 Feb 2021 13:16:39 -0300 Subject: [PATCH 6/6] Stop logging when log_driver is set to 'none' Signed-off-by: Ulysses Souza --- compose/cli/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/cli/main.py b/compose/cli/main.py index 53c9c42bc..494e85620 100644 --- a/compose/cli/main.py +++ b/compose/cli/main.py @@ -1482,7 +1482,7 @@ def log_printer_from_project( keep_prefix=True, ): 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), event_stream or project.events(), cascade_stop=cascade_stop,