tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4863 from shin-/4038-build-labels-v2 

Add support for build labels in 2.1 and 2.2 format
This commit is contained in:
Joffrey F 2017-05-25 14:31:21 -07:00 committed by GitHub
parent 972fe65830 49605f2715
commit bbb771f108
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compose/config/config_schema_v2.1.json
View File

@ -58,7 +58,8 @@
"properties": { "properties": {
"context": {"type": "string"}, "context": {"type": "string"},
"dockerfile": {"type": "string"}, "dockerfile": {"type": "string"},
"args": {"$ref": "#/definitions/list_or_dict"} "args": {"$ref": "#/definitions/list_or_dict"},
"labels": {"$ref": "#/definitions/list_or_dict"}
}, },
"additionalProperties": false "additionalProperties": false
} }

4
compose/config/config_schema_v2.2.json
View File

@ -58,7 +58,9 @@
"properties": { "properties": {
"context": {"type": "string"}, "context": {"type": "string"},
"dockerfile": {"type": "string"}, "dockerfile": {"type": "string"},
"args": {"$ref": "#/definitions/list_or_dict"} "args": {"$ref": "#/definitions/list_or_dict"},
"labels": {"$ref": "#/definitions/list_or_dict"},
"cache_from": {"$ref": "#/definitions/list_of_strings"}
}, },
"additionalProperties": false "additionalProperties": false
} }

15
tests/integration/service_test.py
View File

@ -666,6 +666,21 @@ class ServiceTest(DockerClientTestCase):
assert service.image() assert service.image()
assert "build_version=2" in service.image()['ContainerConfig']['Cmd'] assert "build_version=2" in service.image()['ContainerConfig']['Cmd']
def test_build_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('buildlabels', build={
'context': text_type(base_dir),
'labels': {'com.docker.compose.test': 'true'}
})
service.build()
assert service.image()
assert service.image()['Config']['Labels']['com.docker.compose.test'] == 'true'
def test_start_container_stays_unprivileged(self): def test_start_container_stays_unprivileged(self):
service = self.create_service('web') service = self.create_service('web')
container = create_and_start_container(service).inspect() container = create_and_start_container(service).inspect()