luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #6028 from hashicorp/revert-6001-allow-unix-container-path-in-lcow 

Revert "driver/docker: support unix destination mount path in windows"
This commit is contained in:
Michael Schurter 2019-07-29 14:45:53 -07:00 committed by GitHub
parent f1a0086b53 ea7fac7bcf
commit a9690053bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/docker/win32_volume_parse.go
View File

@ -33,7 +33,7 @@ const (
// rxHostDir is the first option of a source // rxHostDir is the first option of a source
rxHostDir = `(?:\\\\\?\\)?[a-z]:[\\/](?:[^\\/:*?"<>|\r\n]+[\\/]?)*` rxHostDir = `(?:\\\\\?\\)?[a-z]:[\\/](?:[^\\/:*?"<>|\r\n]+[\\/]?)*`
// rxName is the second option of a source // rxName is the second option of a source
rxName = `[^\\/:*?"<>|\r\n]+\/?.*` rxName = `[^\\/:*?"<>|\r\n]+`
// RXReservedNames are reserved names not possible on Windows // RXReservedNames are reserved names not possible on Windows
rxReservedNames = `(con)|(prn)|(nul)|(aux)|(com[1-9])|(lpt[1-9])` rxReservedNames = `(con)|(prn)|(nul)|(aux)|(com[1-9])|(lpt[1-9])`
@ -58,7 +58,7 @@ const (
// - And can be optional // - And can be optional
// rxDestination is the regex expression for the mount destination // rxDestination is the regex expression for the mount destination
rxDestination = `(?P<destination>((?:\\\\\?\\)?([a-z]):((?:[\\/][^\\/:*?"<>\r\n]+)*[\\/]?))|(` + rxPipe + `)|([/].*))` rxDestination = `(?P<destination>((?:\\\\\?\\)?([a-z]):((?:[\\/][^\\/:*?"<>\r\n]+)*[\\/]?))|(` + rxPipe + `))`
// Destination (aka container path): // Destination (aka container path):
// - Variation on hostdir but can be a drive followed by colon as well // - Variation on hostdir but can be a drive followed by colon as well