87e400e44e
When deploying a stack using a relative path as bind-mount source in the compose file, the CLI converts the relative path to an absolute path, relative to the location of the docker-compose file. This causes a problem when deploying a stack that uses an absolute Windows path, because a non-Windows client will fail to detect that the path (e.g. `C:\somedir`) is an absolute path (and not a relative directory named `C:\`). The existing code did already take Windows clients deploying a Linux stack into account (by checking if the path had a leading slash). This patch adds the reverse, and adds detection for Windows absolute paths on non-Windows clients. The code used to detect Windows absolute paths is copied from the Golang filepath package;1d0e94b1e1/src/path/filepath/path_windows.go (L12-L65)Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commitd6dd08d568) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
62 lines
1.6 KiB
Go
62 lines
1.6 KiB
Go
package loader
|
|
|
|
// Copyright 2010 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
// https://github.com/golang/go/blob/master/LICENSE
|
|
|
|
// The code in this file was copied from the Golang filepath package with some
|
|
// small modifications to run it on non-Windows platforms.
|
|
// https://github.com/golang/go/blob/1d0e94b1e13d5e8a323a63cd1cc1ef95290c9c36/src/path/filepath/path_test.go#L711-L763
|
|
|
|
import "testing"
|
|
|
|
type IsAbsTest struct {
|
|
path string
|
|
isAbs bool
|
|
}
|
|
|
|
var isabstests = []IsAbsTest{
|
|
{"", false},
|
|
{"/", true},
|
|
{"/usr/bin/gcc", true},
|
|
{"..", false},
|
|
{"/a/../bb", true},
|
|
{".", false},
|
|
{"./", false},
|
|
{"lala", false},
|
|
}
|
|
|
|
var winisabstests = []IsAbsTest{
|
|
{`C:\`, true},
|
|
{`c\`, false},
|
|
{`c::`, false},
|
|
{`c:`, false},
|
|
{`/`, false},
|
|
{`\`, false},
|
|
{`\Windows`, false},
|
|
{`c:a\b`, false},
|
|
{`c:\a\b`, true},
|
|
{`c:/a/b`, true},
|
|
{`\\host\share\foo`, true},
|
|
{`//host/share/foo/bar`, true},
|
|
}
|
|
|
|
func TestIsAbs(t *testing.T) {
|
|
tests := append(isabstests, winisabstests...)
|
|
// All non-windows tests should fail, because they have no volume letter.
|
|
for _, test := range isabstests {
|
|
tests = append(tests, IsAbsTest{test.path, false})
|
|
}
|
|
// All non-windows test should work as intended if prefixed with volume letter.
|
|
for _, test := range isabstests {
|
|
tests = append(tests, IsAbsTest{"c:" + test.path, test.isAbs})
|
|
}
|
|
|
|
for _, test := range winisabstests {
|
|
if r := isAbs(test.path); r != test.isAbs {
|
|
t.Errorf("IsAbs(%q) = %v, want %v", test.path, r, test.isAbs)
|
|
}
|
|
}
|
|
}
|