tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always use the Windows version of splitdrive when parsing volume mappings 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-05-12 17:38:41 -07:00
parent ca3aef0c84
commit db0a6cf2bb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compose/config/config.py
View File

@ -3,6 +3,7 @@ from __future__ import unicode_literals
import functools import functools
import logging import logging
import ntpath
import operator import operator
import os import os
import string import string
@ -944,7 +945,7 @@ def split_path_mapping(volume_path):
if volume_path.startswith('.') or volume_path.startswith('~'): if volume_path.startswith('.') or volume_path.startswith('~'):
drive, volume_config = '', volume_path drive, volume_config = '', volume_path
else: else:
drive, volume_config = os.path.splitdrive(volume_path) drive, volume_config = ntpath.splitdrive(volume_path)
if ':' in volume_config: if ':' in volume_config:
(host, container) = volume_config.split(':', 1) (host, container) = volume_config.split(':', 1)

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

@ -2658,8 +2658,6 @@ class ExpandPathTest(unittest.TestCase):
class VolumePathTest(unittest.TestCase): class VolumePathTest(unittest.TestCase):
@pytest.mark.xfail((not IS_WINDOWS_PLATFORM), reason='does not have a drive')
def test_split_path_mapping_with_windows_path(self): def test_split_path_mapping_with_windows_path(self):
host_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config" host_path = "c:\\Users\\msamblanet\\Documents\\anvil\\connect\\config"
windows_volume_path = host_path + ":/opt/connect/config:ro" windows_volume_path = host_path + ":/opt/connect/config:ro"