tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7745 from ulyssessouza/maintain-version

Browse Source 
Preserve the version when specified in the file
This commit is contained in:
Anca Iordache 2020-09-10 14:14:15 +02:00 committed by GitHub
commit bf3002771e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/config/config.py
View File

@ -224,8 +224,6 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
if version.startswith("1"): if version.startswith("1"):
version = V1 version = V1
else:
version = VERSION
if version == V1: if version == V1:
raise ConfigurationError( raise ConfigurationError(

18
tests/acceptance/cli_test.py
View File

@ -284,7 +284,7 @@ services:
output = yaml.safe_load(result.stdout) output = yaml.safe_load(result.stdout)
expected = { expected = {
'version': str(VERSION), 'version': '2',
'volumes': {'data': {'driver': 'local'}}, 'volumes': {'data': {'driver': 'local'}},
'networks': {'front': {}}, 'networks': {'front': {}},
'services': { 'services': {
@ -308,7 +308,7 @@ services:
self.base_dir = 'tests/fixtures/restart' self.base_dir = 'tests/fixtures/restart'
result = self.dispatch(['config']) result = self.dispatch(['config'])
assert yaml.safe_load(result.stdout) == { assert yaml.safe_load(result.stdout) == {
'version': str(VERSION), 'version': '2',
'services': { 'services': {
'never': { 'never': {
'image': 'busybox', 'image': 'busybox',
@ -354,12 +354,12 @@ services:
result = self.dispatch(['config']) result = self.dispatch(['config'])
json_result = yaml.safe_load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert json_result == { assert json_result == {
'version': str(VERSION), 'version': '2.4',
'services': { 'services': {
'web': { 'web': {
'command': 'true', 'command': 'true',
'image': 'alpine:latest', 'image': 'alpine:latest',
'ports': [{'target': 5643}, {'target': 9999}] 'ports': ['5643/tcp', '9999/tcp']
} }
} }
} }
@ -369,12 +369,12 @@ services:
result = self.dispatch(['--env-file', '.env2', 'config']) result = self.dispatch(['--env-file', '.env2', 'config'])
json_result = yaml.safe_load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert json_result == { assert json_result == {
'version': str(VERSION), 'version': '2.4',
'services': { 'services': {
'web': { 'web': {
'command': 'false', 'command': 'false',
'image': 'alpine:latest', 'image': 'alpine:latest',
'ports': [{'target': 5644}, {'target': 9998}] 'ports': ['5644/tcp', '9998/tcp']
} }
} }
} }
@ -384,12 +384,12 @@ services:
result = self.dispatch(['--project-directory', 'alt/', 'config']) result = self.dispatch(['--project-directory', 'alt/', 'config'])
json_result = yaml.safe_load(result.stdout) json_result = yaml.safe_load(result.stdout)
assert json_result == { assert json_result == {
'version': str(VERSION), 'version': '2.4',
'services': { 'services': {
'web': { 'web': {
'command': 'echo uwu', 'command': 'echo uwu',
'image': 'alpine:3.10.1', 'image': 'alpine:3.10.1',
'ports': [{'target': 3341}, {'target': 4449}] 'ports': ['3341/tcp', '4449/tcp']
} }
} }
} }
@ -501,7 +501,7 @@ services:
self.base_dir = 'tests/fixtures/v3-full' self.base_dir = 'tests/fixtures/v3-full'
result = self.dispatch(['config']) result = self.dispatch(['config'])
assert yaml.safe_load(result.stdout) == { assert yaml.safe_load(result.stdout) == {
'version': str(VERSION), 'version': '3.5',
'volumes': { 'volumes': {
'foobar': { 'foobar': {
'labels': { 'labels': {

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

@ -160,25 +160,20 @@ class ConfigTest(unittest.TestCase):
} }
def test_valid_versions(self): def test_valid_versions(self):
for version in ['2', '2.0']: cfg = config.load(
build_config_details({
'services': {
'foo': {'image': 'busybox'},
'bar': {'image': 'busybox', 'environment': ['FOO=1']},
}
})
)
assert cfg.version == VERSION
for version in ['2', '2.0', '2.1', '2.2', '2.3',
'3', '3.0', '3.1', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7', '3.8']:
cfg = config.load(build_config_details({'version': version})) cfg = config.load(build_config_details({'version': version}))
assert cfg.version == VERSION assert cfg.version == version
cfg = config.load(build_config_details({'version': '2.1'}))
assert cfg.version == VERSION
cfg = config.load(build_config_details({'version': '2.2'}))
assert cfg.version == VERSION
cfg = config.load(build_config_details({'version': '2.3'}))
assert cfg.version == VERSION
for version in ['3', '3.0']:
cfg = config.load(build_config_details({'version': version}))
assert cfg.version == VERSION
cfg = config.load(build_config_details({'version': '3.1'}))
assert cfg.version == VERSION
def test_v1_file_version(self): def test_v1_file_version(self):
cfg = config.load(build_config_details({'web': {'image': 'busybox'}})) cfg = config.load(build_config_details({'web': {'image': 'busybox'}}))