diff --git a/cmd/containerd/config_unsupported.go b/cmd/containerd/config_unsupported.go index 625c4affa..80f4292a5 100644 --- a/cmd/containerd/config_unsupported.go +++ b/cmd/containerd/config_unsupported.go @@ -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, }, } } diff --git a/cmd/containerd/config_windows.go b/cmd/containerd/config_windows.go index c11145172..b7c82a322 100644 --- a/cmd/containerd/config_windows.go +++ b/cmd/containerd/config_windows.go @@ -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, }, } } diff --git a/defaults/defaults.go b/defaults/defaults_unix.go similarity index 78% rename from defaults/defaults.go rename to defaults/defaults_unix.go index d01dbde88..b98d0dd94 100644 --- a/defaults/defaults.go +++ b/defaults/defaults_unix.go @@ -1,5 +1,5 @@ -// Package defaults provides several common defaults for interacting wtih -// containerd. These can be used on the client-side or server-side. +// +build !windows + package defaults const ( diff --git a/defaults/defaults_windows.go b/defaults/defaults_windows.go new file mode 100644 index 000000000..977279962 --- /dev/null +++ b/defaults/defaults_windows.go @@ -0,0 +1,24 @@ +// +build windows + +package defaults + +import ( + "os" + "path/filepath" +) + +var ( + // DefaultRootDir is the default location used by containerd to store + // persistent data + DefaultRootDir = filepath.Join(os.Getenv("programfiles"), "containerd", "root") + // DefaultStateDir is the default location used by containerd to store + // transient data + DefaultStateDir = filepath.Join(os.Getenv("programfiles"), "containerd", "state") +) + +const ( + // DefaultAddress is the default winpipe address + DefaultAddress = `\\.\pipe\containerd-containerd` + // DefaultDebugAddress is the default winpipe address for pprof data + DefaultDebugAddress = `\\.\pipe\containerd-debug` +) diff --git a/defaults/doc.go b/defaults/doc.go new file mode 100644 index 000000000..2c6e39f55 --- /dev/null +++ b/defaults/doc.go @@ -0,0 +1,3 @@ +// Package defaults provides several common defaults for interacting wtih +// containerd. These can be used on the client-side or server-side. +package defaults diff --git a/server/server_solaris.go b/server/server_solaris.go index 71e1c0927..3c39816be 100644 --- a/server/server_solaris.go +++ b/server/server_solaris.go @@ -2,13 +2,6 @@ package server import "context" -const ( - // DefaultAddress is the default unix socket address - DefaultAddress = "/var/run/containerd/containerd.sock" - // DefaultDebugAddress is the default unix socket address for pprof data - DefaultDebugAddress = "/var/run/containerd/debug.sock" -) - func apply(_ context.Context, _ *Config) error { return nil } diff --git a/server/server_unsupported.go b/server/server_unsupported.go index f820e3f0c..4df599e11 100644 --- a/server/server_unsupported.go +++ b/server/server_unsupported.go @@ -4,19 +4,6 @@ package server import "context" -const ( - // DefaultRootDir is the default location used by containerd to store - // persistent data - DefaultRootDir = "/var/lib/containerd" - // DefaultStateDir is the default location used by containerd to store - // transient data - DefaultStateDir = "/run/containerd" - // DefaultAddress is the default unix socket address - DefaultAddress = "/run/containerd/containerd.sock" - // DefaultDebugAddress is the default unix socket address for pprof data - DefaultDebugAddress = "/run/containerd/debug.sock" -) - func apply(_ context.Context, _ *Config) error { return nil } diff --git a/server/server_windows.go b/server/server_windows.go index b35e776f7..37b71dfa1 100644 --- a/server/server_windows.go +++ b/server/server_windows.go @@ -4,24 +4,6 @@ package server import ( "context" - "os" - "path/filepath" -) - -var ( - // DefaultRootDir is the default location used by containerd to store - // persistent data - DefaultRootDir = filepath.Join(os.Getenv("programfiles"), "containerd", "root") - // DefaultStateDir is the default location used by containerd to store - // transient data - DefaultStateDir = filepath.Join(os.Getenv("programfiles"), "containerd", "state") -) - -const ( - // DefaultAddress is the default winpipe address - DefaultAddress = `\\.\pipe\containerd-containerd` - // DefaultDebugAddress is the default winpipe address for pprof data - DefaultDebugAddress = `\\.\pipe\containerd-debug` ) func apply(_ context.Context, _ *Config) error {