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

Merge pull request #4360 from shin-/4359-volume-labels

Browse Source 
Fix volume definition in v3 schema
This commit is contained in:
Joffrey F 2017-01-19 17:40:29 -08:00 committed by GitHub
commit 263b9e9317
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/config/config_schema_v3.0.json
View File

@ -330,9 +330,9 @@
"name": {"type": "string"} "name": {"type": "string"}
}, },
"additionalProperties": false "additionalProperties": false
} },
"labels": {"$ref": "#/definitions/list_or_dict"}
}, },
"labels": {"$ref": "#/definitions/list_or_dict"},
"additionalProperties": false "additionalProperties": false
}, },

8
tests/acceptance/cli_test.py
View File

@ -295,7 +295,13 @@ class CLITestCase(DockerClientTestCase):
assert yaml.load(result.stdout) == { assert yaml.load(result.stdout) == {
'version': '3.0', 'version': '3.0',
'networks': {}, 'networks': {},
'volumes': {}, 'volumes': {
'foobar': {
'labels': {
'com.docker.compose.test': 'true',
},
},
},
'services': { 'services': {
'web': { 'web': {
'image': 'busybox', 'image': 'busybox',

4
tests/fixtures/v3-full/docker-compose.yml vendored
View File

@ -35,3 +35,7 @@ services:
retries: 5 retries: 5
stop_grace_period: 20s stop_grace_period: 20s
volumes:
foobar:
labels:
com.docker.compose.test: 'true'

7
tests/integration/testcases.py
View File

@ -13,6 +13,7 @@ from compose.config.config import resolve_environment
from compose.config.config import V1 from compose.config.config import V1
from compose.config.config import V2_0 from compose.config.config import V2_0
from compose.config.config import V2_1 from compose.config.config import V2_1
from compose.config.config import V3_0
from compose.config.environment import Environment from compose.config.environment import Environment
from compose.const import API_VERSIONS from compose.const import API_VERSIONS
from compose.const import LABEL_PROJECT from compose.const import LABEL_PROJECT
@ -36,13 +37,15 @@ def get_links(container):
def engine_max_version(): def engine_max_version():
if 'DOCKER_VERSION' not in os.environ: if 'DOCKER_VERSION' not in os.environ:
return V2_1 return V3_0
version = os.environ['DOCKER_VERSION'].partition('-')[0] version = os.environ['DOCKER_VERSION'].partition('-')[0]
if version_lt(version, '1.10'): if version_lt(version, '1.10'):
return V1 return V1
elif version_lt(version, '1.12'): elif version_lt(version, '1.12'):
return V2_0 return V2_0
return V2_1 elif version_lt(version, '1.13'):
return V2_1
return V3_0
def build_version_required_decorator(ignored_versions): def build_version_required_decorator(ignored_versions):