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

Merge pull request #1283 from mlaventure/resurrect-state-dir

Browse Source 
Resurrect State directory
This commit is contained in:
Phil Estes
2017-08-07 10:41:21 -04:00
committed by GitHub
parent fc9410888f 8700e23a10
commit e9b86af848
15 changed files with 89 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/containerd/config_linux.go
View File

@@ -6,7 +6,8 @@ import (
func defaultConfig() *server.Config {
return &server.Config{
Root: "/var/lib/containerd",
Root: server.DefaultRootDir,
State: server.DefaultStateDir,
GRPC: server.GRPCConfig{
Address: server.DefaultAddress,
},

3
cmd/containerd/config_unsupported.go
View File

@@ -6,7 +6,8 @@ import "github.com/containerd/containerd/server"
func defaultConfig() *server.Config {
return &server.Config{
Root: "/var/lib/containerd",
Root: server.DefaultRootDir,
State: server.DefaultStateDir,
GRPC: server.GRPCConfig{
Address: server.DefaultAddress,
},

10
cmd/containerd/config_windows.go
View File

@@ -1,15 +1,11 @@
package main
import (
"os"
"path/filepath"
"github.com/containerd/containerd/server"
)
import "github.com/containerd/containerd/server"
func defaultConfig() *server.Config {
return &server.Config{
Root: filepath.Join(os.Getenv("programfiles"), "containerd", "root"),
Root: server.DefaultRootDir,
State: server.DefaultStateDir,
GRPC: server.GRPCConfig{
Address: server.DefaultAddress,
},