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

Resurrect State directory

cmd/containerd-shim/main_unix.go

@@ -58,6 +58,10 @@ func main() {
 			Name:  "address,a",
 			Usage: "grpc address back to containerd",
 		},
+		cli.StringFlag{
+			Name:  "workdir,w",
+			Usage: "path used to store large temporary data",
+		},
 	}
 	app.Before = func(context *cli.Context) error {
 		if context.GlobalBool("debug") {
@@ -84,6 +88,7 @@ func main() {
 		sv, err := shim.NewService(
 			path,
 			context.GlobalString("namespace"),
+			context.GlobalString("workdir"),
 			&remoteEventsPublisher{client: e},
 		)
 		if err != nil {

cmd/containerd/config_linux.go

@@ -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,
 		},

cmd/containerd/config_unsupported.go

@@ -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,
 		},

cmd/containerd/config_windows.go

@@ -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,
 		},