mirror of
https://github.com/docker/compose.git
synced 2025-07-24 22:24:41 +02:00
Environment keys can contain empty values
Environment keys that contain no value, get populated with values taken from the environment not from the build phase but from running the command `up`. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
parent
5fdb75b541
commit
0e4f9c9a66
@ -41,7 +41,7 @@
|
||||
"type": "object",
|
||||
"patternProperties": {
|
||||
"^[^-]+$": {
|
||||
"type": ["string", "number", "boolean"],
|
||||
"type": ["string", "number", "boolean", "null"],
|
||||
"format": "environment"
|
||||
}
|
||||
},
|
||||
|
@ -136,7 +136,7 @@ def process_errors(errors, service_name=None):
|
||||
if len(validator) >= 2:
|
||||
first_type = anglicize_validator(validator[0])
|
||||
last_type = anglicize_validator(validator[-1])
|
||||
types_from_validator = "{}".format(", ".join([first_type] + validator[1:-1]))
|
||||
types_from_validator = ", ".join([first_type] + validator[1:-1])
|
||||
|
||||
msg = "{} or {}".format(
|
||||
types_from_validator,
|
||||
|
@ -449,6 +449,23 @@ class InterpolationTest(unittest.TestCase):
|
||||
self.assertIn('in service "web"', cm.exception.msg)
|
||||
self.assertIn('"${"', cm.exception.msg)
|
||||
|
||||
def test_empty_environment_key_allowed(self):
|
||||
service_dict = config.load(
|
||||
build_config_details(
|
||||
{
|
||||
'web': {
|
||||
'build': '.',
|
||||
'environment': {
|
||||
'POSTGRES_PASSWORD': ''
|
||||
},
|
||||
},
|
||||
},
|
||||
'.',
|
||||
None,
|
||||
)
|
||||
)[0]
|
||||
self.assertEquals(service_dict['environment']['POSTGRES_PASSWORD'], '')
|
||||
|
||||
|
||||
class VolumeConfigTest(unittest.TestCase):
|
||||
def test_no_binding(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user