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 #2373 from shin-/2370-env_vars_with_dashes 

Allow dashes in environment variable names
This commit is contained in:
Joffrey F 2015-11-11 13:20:22 -08:00
parent a746d673b1 d6b44905f2
commit 0a35fd93cd
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/config/fields_schema.json
View File

@ -40,7 +40,7 @@
{ {
"type": "object", "type": "object",
"patternProperties": { "patternProperties": {
"^[^-]+$": { ".+": {
"type": ["string", "number", "boolean", "null"], "type": ["string", "number", "boolean", "null"],
"format": "environment" "format": "environment"
} }

24
tests/unit/config/config_test.py
View File

@ -480,20 +480,18 @@ class ConfigTest(unittest.TestCase):
self.assertTrue(mock_logging.warn.called) self.assertTrue(mock_logging.warn.called)
self.assertTrue(expected_warning_msg in mock_logging.warn.call_args[0][0]) self.assertTrue(expected_warning_msg in mock_logging.warn.call_args[0][0])
def test_config_invalid_environment_dict_key_raises_validation_error(self): def test_config_valid_environment_dict_key_contains_dashes(self):
expected_error_msg = "Service 'web' configuration key 'environment' contains unsupported option: '---'" services = config.load(
build_config_details(
with self.assertRaisesRegexp(ConfigurationError, expected_error_msg): {'web': {
config.load( 'image': 'busybox',
build_config_details( 'environment': {'SPRING_JPA_HIBERNATE_DDL-AUTO': 'none'}
{'web': { }},
'image': 'busybox', 'working_dir',
'environment': {'---': 'nope'} 'filename.yml'
}},
'working_dir',
'filename.yml'
)
) )
)
self.assertEqual(services[0]['environment']['SPRING_JPA_HIBERNATE_DDL-AUTO'], 'none')
def test_load_yaml_with_yaml_error(self): def test_load_yaml_with_yaml_error(self):
tmpdir = py.test.ensuretemp('invalid_yaml_test') tmpdir = py.test.ensuretemp('invalid_yaml_test')