From 1a688289b42c6927c3e05304c5259db1f85c69c4 Mon Sep 17 00:00:00 2001 From: luHub Date: Sat, 28 Mar 2020 17:50:23 +0100 Subject: [PATCH] add labels to CLIbuilder Signed-off-by: luHub --- compose/service.py | 1 + tests/integration/service_test.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/compose/service.py b/compose/service.py index ebe237b8c..92b2b3329 100644 --- a/compose/service.py +++ b/compose/service.py @@ -1792,6 +1792,7 @@ class _CLIBuilder(object): command_builder.add_list("--cache-from", cache_from) command_builder.add_arg("--file", dockerfile) command_builder.add_flag("--force-rm", forcerm) + command_builder.add_params("--label", labels) command_builder.add_arg("--memory", container_limits.get("memory")) command_builder.add_flag("--no-cache", nocache) command_builder.add_arg("--progress", self._progress) diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py index c50aab08b..01e2e1d22 100644 --- a/tests/integration/service_test.py +++ b/tests/integration/service_test.py @@ -985,6 +985,23 @@ class ServiceTest(DockerClientTestCase): self.addCleanup(self.client.remove_image, service.image_name) assert self.client.inspect_image('composetest_web') + def test_build_cli_with_build_labels(self): + base_dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, base_dir) + + with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f: + f.write("FROM busybox\n") + + service = self.create_service('web', + build={ + 'context': base_dir, + 'labels': {'com.docker.compose.test': 'true'}}, + ) + service.build(cli=True) + self.addCleanup(self.client.remove_image, service.image_name) + image = self.client.inspect_image('composetest_web') + assert image['Config']['Labels']['com.docker.compose.test'] + def test_up_build_cli(self): base_dir = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, base_dir)