tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7328 from luHub/7242-fix-cli-no-labels

Browse Source 
Bug fix 7242 docker-compose with buildkit does not insert container labels
This commit is contained in:
Ulysses Souza 2020-03-31 03:01:27 +02:00 committed by GitHub
commit 440c94ea7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/service.py
View File

@ -1792,6 +1792,7 @@ class _CLIBuilder(object):
command_builder.add_list("--cache-from", cache_from) command_builder.add_list("--cache-from", cache_from)
command_builder.add_arg("--file", dockerfile) command_builder.add_arg("--file", dockerfile)
command_builder.add_flag("--force-rm", forcerm) 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_arg("--memory", container_limits.get("memory"))
command_builder.add_flag("--no-cache", nocache) command_builder.add_flag("--no-cache", nocache)
command_builder.add_arg("--progress", self._progress) command_builder.add_arg("--progress", self._progress)

17
tests/integration/service_test.py
View File

@ -985,6 +985,23 @@ class ServiceTest(DockerClientTestCase):
self.addCleanup(self.client.remove_image, service.image_name) self.addCleanup(self.client.remove_image, service.image_name)
assert self.client.inspect_image('composetest_web') 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): def test_up_build_cli(self):
base_dir = tempfile.mkdtemp() base_dir = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, base_dir) self.addCleanup(shutil.rmtree, base_dir)