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

memory values can be strings or numbers

Browse Source 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-08-12 17:29:33 +01:00
parent 711b0b4daf
commit 440099754d
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compose/config/schema.json
View File

@ -68,8 +68,18 @@
}, },
"mac_address": {"type": "string"}, "mac_address": {"type": "string"},
"mem_limit": {"type": "number"}, "mem_limit": {
"memswap_limit": {"type": "number"}, "oneOf": [
{"type": "number"},
{"type": "string"}
]
},
"memswap_limit": {
"oneOf": [
{"type": "number"},
{"type": "string"}
]
},
"name": {"type": "string"}, "name": {"type": "string"},
"net": {"type": "string"}, "net": {"type": "string"},
"pid": {"type": "string"}, "pid": {"type": "string"},

10
tests/unit/config_test.py
View File

@ -533,6 +533,16 @@ class MemoryOptionsTest(unittest.TestCase):
) )
self.assertEqual(service_dict[0]['memswap_limit'], 2000000) self.assertEqual(service_dict[0]['memswap_limit'], 2000000)
def test_memswap_can_be_a_string(self):
service_dict = config.load(
config.ConfigDetails(
{'foo': {'image': 'busybox', 'mem_limit': "1G", 'memswap_limit': "512M"}},
'tests/fixtures/extends',
'common.yml'
)
)
self.assertEqual(service_dict[0]['memswap_limit'], "512M")
class EnvTest(unittest.TestCase): class EnvTest(unittest.TestCase):
def test_parse_environment_as_list(self): def test_parse_environment_as_list(self):