From ea7fac7bcfaa023e17bfaa704a7b5dc0e3172fba Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Mon, 29 Jul 2019 09:09:54 -0700 Subject: [PATCH] Revert "driver/docker: support unix destination mount path in windows" --- drivers/docker/win32_volume_parse.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/docker/win32_volume_parse.go b/drivers/docker/win32_volume_parse.go index c7c2b4e58..8cce6023b 100644 --- a/drivers/docker/win32_volume_parse.go +++ b/drivers/docker/win32_volume_parse.go @@ -33,7 +33,7 @@ const ( // rxHostDir is the first option of a source rxHostDir = `(?:\\\\\?\\)?[a-z]:[\\/](?:[^\\/:*?"<>|\r\n]+[\\/]?)*` // rxName is the second option of a source - rxName = `[^\\/:*?"<>|\r\n]+\/?.*` + rxName = `[^\\/:*?"<>|\r\n]+` // RXReservedNames are reserved names not possible on Windows rxReservedNames = `(con)|(prn)|(nul)|(aux)|(com[1-9])|(lpt[1-9])` @@ -58,7 +58,7 @@ const ( // - And can be optional // rxDestination is the regex expression for the mount destination - rxDestination = `(?P((?:\\\\\?\\)?([a-z]):((?:[\\/][^\\/:*?"<>\r\n]+)*[\\/]?))|(` + rxPipe + `)|([/].*))` + rxDestination = `(?P((?:\\\\\?\\)?([a-z]):((?:[\\/][^\\/:*?"<>\r\n]+)*[\\/]?))|(` + rxPipe + `))` // Destination (aka container path): // - Variation on hostdir but can be a drive followed by colon as well