Merge pull request #1036 from crosbymichael/client-addr

Add DefaultAddress to client

client_unix.go

@@ -9,6 +9,9 @@ import (
 	"time"
 )
 
+// DefaultAddress is the default unix socket address
+const DefaultAddress = "/run/containerd/containerd.sock"
+
 func dialer(address string, timeout time.Duration) (net.Conn, error) {
 	address = strings.TrimPrefix(address, "unix://")
 	return net.DialTimeout("unix", address, timeout)

client_windows.go

@@ -7,6 +7,9 @@ import (
 	winio "github.com/Microsoft/go-winio"
 )
 
+// DefaultAddress is the default unix socket address
+const DefaultAddress = `\\.\pipe\containerd-containerd`
+
 func dialer(address string, timeout time.Duration) (net.Conn, error) {
 	return winio.DialPipe(address, &timeout)
 }

cmd/containerd/config_linux.go

@@ -1,10 +1,12 @@
 package main
 
+import "github.com/containerd/containerd"
+
 func defaultConfig() *config {
 	return &config{
 		Root: "/var/lib/containerd",
 		GRPC: grpcConfig{
-			Address: "/run/containerd/containerd.sock",
+			Address: containerd.DefaultAddress,
 		},
 		Debug: debug{
 			Level:   "info",

cmd/ctr/main.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/version"
 	"github.com/urfave/cli"
 )
@@ -38,7 +39,7 @@ containerd CLI
 		cli.StringFlag{
 			Name:  "address, a",
 			Usage: "address for containerd's GRPC server",
-			Value: "/run/containerd/containerd.sock",
+			Value: containerd.DefaultAddress,
 		},
 		cli.DurationFlag{
 			Name:  "timeout",