jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of service.dockerfile key

Browse source 
Made invalid in v2 format
Doesn't break build config anymore

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-01-14 12:10:42 -08:00
commit 13063a96cb
3 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/unit/config/config_test.py
View file

@ -430,23 +430,35 @@ class ConfigTest(unittest.TestCase):
self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
def test_config_build_configuration_v2(self):
service = config.load(
build_config_details(
{
'version': 2,
'services': {
'web': {
'build': '.',
'dockerfile': 'Dockerfile-alt'
# service.dockerfile is invalid in v2
with self.assertRaises(ConfigurationError):
config.load(
build_config_details(
{
'version': 2,
'services': {
'web': {
'build': '.',
'dockerfile': 'Dockerfile-alt'
}
}
}
},
'tests/fixtures/extends',
'filename.yml'
},
'tests/fixtures/extends',
'filename.yml'
)
)
).services
self.assertTrue('context' in service[0]['build'])
self.assertEqual(service[0]['build']['dockerfile'], 'Dockerfile-alt')
service = config.load(
build_config_details({
'version': 2,
'services': {
'web': {
'build': '.'
}
}
}, 'tests/fixtures/extends', 'filename.yml')
).services[0]
self.assertTrue('context' in service['build'])
service = config.load(
build_config_details(