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

Use defaults pkg for all platforms

Browse Source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure
2017-11-28 18:04:21 -08:00
parent 90a6b79bfc
commit 6bf779c589
8 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/containerd/config_unsupported.go
View File

@@ -2,18 +2,21 @@
package main
import "github.com/containerd/containerd/server"
import (
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/server"
)
func defaultConfig() *server.Config {
return &server.Config{
Root: server.DefaultRootDir,
State: server.DefaultStateDir,
Root: defaults.DefaultRootDir,
State: defaults.DefaultStateDir,
GRPC: server.GRPCConfig{
Address: server.DefaultAddress,
Address: defaults.DefaultAddress,
},
Debug: server.Debug{
Level: "info",
Address: server.DefaultDebugAddress,
Address: defaults.DefaultDebugAddress,
},
}
}

13
cmd/containerd/config_windows.go
View File

@@ -1,17 +1,20 @@
package main
import "github.com/containerd/containerd/server"
import (
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/server"
)
func defaultConfig() *server.Config {
return &server.Config{
Root: server.DefaultRootDir,
State: server.DefaultStateDir,
Root: defaults.DefaultRootDir,
State: defaults.DefaultStateDir,
GRPC: server.GRPCConfig{
Address: server.DefaultAddress,
Address: defaults.DefaultAddress,
},
Debug: server.Debug{
Level: "info",
Address: server.DefaultDebugAddress,
Address: defaults.DefaultDebugAddress,
},
}
}