github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix hosts test on Windows

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2021-03-27 16:21:52 -07:00
parent 3f406d4af6
commit 9e19a29847
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
remotes/docker/config/hosts.go
View File

@ -401,10 +401,6 @@ func parseHostConfig(server string, baseDir string, config HostFileConfig) (host
switch cert := config.CACert.(type) { switch cert := config.CACert.(type) {
case string: case string:
result.caCerts = []string{makeAbsPath(cert, baseDir)} result.caCerts = []string{makeAbsPath(cert, baseDir)}
case []string:
for _, p := range cert {
result.caCerts = append(result.caCerts, makeAbsPath(p, baseDir))
}
case []interface{}: case []interface{}:
result.caCerts, err = makeStringSlice(cert, func(p string) string { result.caCerts, err = makeStringSlice(cert, func(p string) string {
return makeAbsPath(p, baseDir) return makeAbsPath(p, baseDir)
@ -428,7 +424,9 @@ func parseHostConfig(server string, baseDir string, config HostFileConfig) (host
case string: case string:
result.clientPairs = append(result.clientPairs, [2]string{makeAbsPath(p, baseDir), ""}) result.clientPairs = append(result.clientPairs, [2]string{makeAbsPath(p, baseDir), ""})
case []interface{}: case []interface{}:
slice, err := makeStringSlice(p, nil) slice, err := makeStringSlice(p, func(s string) string {
return makeAbsPath(s, baseDir)
})
if err != nil { if err != nil {
return hostConfig{}, err return hostConfig{}, err
} }