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 #4562 from shin-/lindt-bugfix/unnamed_volumes_do_not_support_mode_suffix 

Do not add mode to anonymous volumes in config output
This commit is contained in:
Joffrey F 2017-03-06 18:21:36 -08:00 committed by GitHub
parent b454268f93 83728d2bcc
commit 4dca6adeb1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compose/config/types.py
View File

@ -203,7 +203,8 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
def repr(self): def repr(self):
external = self.external + ':' if self.external else '' external = self.external + ':' if self.external else ''
return '{ext}{v.internal}:{v.mode}'.format(ext=external, v=self) mode = ':' + self.mode if self.external else ''
return '{ext}{v.internal}{mode}'.format(mode=mode, ext=external, v=self)
@property @property
def is_named_volume(self): def is_named_volume(self):

4
tests/acceptance/cli_test.py
View File

@ -222,7 +222,7 @@ class CLITestCase(DockerClientTestCase):
'other': { 'other': {
'image': 'busybox:latest', 'image': 'busybox:latest',
'command': 'top', 'command': 'top',
'volumes': ['/data:rw'], 'volumes': ['/data'],
}, },
}, },
} }
@ -299,7 +299,7 @@ class CLITestCase(DockerClientTestCase):
}, },
'volume': { 'volume': {
'image': 'busybox', 'image': 'busybox',
'volumes': ['/data:rw'], 'volumes': ['/data'],
'network_mode': 'bridge', 'network_mode': 'bridge',
}, },
'app': { 'app': {