Merge pull request #1224 from epilatow/solaris.cc.20170719.0

Add solaris build support
This commit is contained in:
Michael Crosby
2017-08-07 16:15:07 -04:00
committed by GitHub
114 changed files with 6842 additions and 3876 deletions

14
server/server_solaris.go Normal file
View File

@@ -0,0 +1,14 @@
package server
import "context"
const (
// DefaultAddress is the default unix socket address
DefaultAddress = "/var/run/containerd/containerd.sock"
// DefaultDebuggAddress is the default unix socket address for pprof data
DefaultDebugAddress = "/var/run/containerd/debug.sock"
)
func apply(_ context.Context, _ *Config) error {
return nil
}

View File

@@ -1,4 +1,4 @@
// +build !linux,!windows
// +build !linux,!windows,!solaris
package server