Skip to content

Commit

Permalink
Don't convert slashes for UNIX paths on Windows hosts
Browse files Browse the repository at this point in the history
Signed-off-by: Joffrey F <[email protected]>
  • Loading branch information
shin- committed Sep 19, 2018
1 parent a5f42ae commit 34c37f9
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions compose/config/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,20 @@ def normalize_path_for_engine(path):
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):
options_map = {
'volume': {
Expand All @@ -152,12 +166,11 @@ class MountSpec(object):

@classmethod
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['type'] == 'tmpfs':
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:
mount_dict['source'] = normalize_path_for_engine(mount_dict['source'])

Expand Down Expand Up @@ -247,7 +260,7 @@ def separate_next_section(volume_config):
else:
external = parts[0]
parts = separate_next_section(parts[1])
external = ntpath.normpath(external)
external = normpath(external, True)
internal = parts[0]
if len(parts) > 1:
if ':' in parts[1]:
Expand Down

0 comments on commit 34c37f9

Please sign in to comment.