From e92906f71791fcb86c917d9a585ccb74e7f31fbb Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 26 Aug 2015 12:37:01 -0700 Subject: [PATCH] Windows: Fix use of IsAbs check Signed-off-by: John Howard --- system/filesys.go | 6 ++++++ system/filesys_windows.go | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/system/filesys.go b/system/filesys.go index 3e26e35..c14feb8 100644 --- a/system/filesys.go +++ b/system/filesys.go @@ -4,6 +4,7 @@ package system import ( "os" + "path/filepath" ) // MkdirAll creates a directory named path along with any necessary parents, @@ -11,3 +12,8 @@ import ( func MkdirAll(path string, perm os.FileMode) error { return os.MkdirAll(path, perm) } + +// IsAbs is a platform-specific wrapper for filepath.IsAbs. +func IsAbs(path string) bool { + return filepath.IsAbs(path) +} diff --git a/system/filesys_windows.go b/system/filesys_windows.go index 90b5006..16823d5 100644 --- a/system/filesys_windows.go +++ b/system/filesys_windows.go @@ -4,7 +4,9 @@ package system import ( "os" + "path/filepath" "regexp" + "strings" "syscall" ) @@ -62,3 +64,19 @@ func MkdirAll(path string, perm os.FileMode) error { } return nil } + +// IsAbs is a platform-specific wrapper for filepath.IsAbs. On Windows, +// golang filepath.IsAbs does not consider a path \windows\system32 as absolute +// as it doesn't start with a drive-letter/colon combination. However, in +// docker we need to verify things such as WORKDIR /windows/system32 in +// a Dockerfile (which gets translated to \windows\system32 when being processed +// by the daemon. This SHOULD be treated as absolute from a docker processing +// perspective. +func IsAbs(path string) bool { + if !filepath.IsAbs(path) { + if !strings.HasPrefix(path, string(os.PathSeparator)) { + return false + } + } + return true +}