tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't convert slashes for UNIX paths on Windows hosts

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-09-19 11:18:09 -07:00
parent a5f42ae9e4
commit 9f9122cd95
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compose/config/types.py
View File

@ -136,6 +136,20 @@ def normalize_path_for_engine(path):
return path.replace('\\', '/') return path.replace('\\', '/')
def normpath(path, win_host=False):
""" Custom path normalizer that handles Compose-specific edge cases like
UNIX paths on Windows hosts and vice-versa. """
sysnorm = ntpath.normpath if win_host else os.path.normpath
# If a path looks like a UNIX absolute path on Windows, it probably is;
# we'll need to revert the backslashes to forward slashes after normalization
flip_slashes = path.startswith('/') and IS_WINDOWS_PLATFORM
path = sysnorm(path)
if flip_slashes:
path = path.replace('\\', '/')
return path
class MountSpec(object): class MountSpec(object):
options_map = { options_map = {
'volume': { 'volume': {
@ -152,12 +166,11 @@ class MountSpec(object):
@classmethod @classmethod
def parse(cls, mount_dict, normalize=False, win_host=False): def parse(cls, mount_dict, normalize=False, win_host=False):
normpath = ntpath.normpath if win_host else os.path.normpath
if mount_dict.get('source'): if mount_dict.get('source'):
if mount_dict['type'] == 'tmpfs': if mount_dict['type'] == 'tmpfs':
raise ConfigurationError('tmpfs mounts can not specify a source') raise ConfigurationError('tmpfs mounts can not specify a source')
mount_dict['source'] = normpath(mount_dict['source']) mount_dict['source'] = normpath(mount_dict['source'], win_host)
if normalize: if normalize:
mount_dict['source'] = normalize_path_for_engine(mount_dict['source']) mount_dict['source'] = normalize_path_for_engine(mount_dict['source'])
@ -247,7 +260,7 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
else: else:
external = parts[0] external = parts[0]
parts = separate_next_section(parts[1]) parts = separate_next_section(parts[1])
external = ntpath.normpath(external) external = normpath(external, True)
internal = parts[0] internal = parts[0]
if len(parts) > 1: if len(parts) > 1:
if ':' in parts[1]: if ':' in parts[1]:

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

@ -1291,7 +1291,7 @@ class ConfigTest(unittest.TestCase):
assert tmpfs_mount.target == '/tmpfs' assert tmpfs_mount.target == '/tmpfs'
assert not tmpfs_mount.is_named_volume assert not tmpfs_mount.is_named_volume
assert host_mount.source == os.path.normpath('/abc') assert host_mount.source == '/abc'
assert host_mount.target == '/xyz' assert host_mount.target == '/xyz'
assert not host_mount.is_named_volume assert not host_mount.is_named_volume