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

View File

@@ -1,4 +1,4 @@
// +build darwin freebsd
// +build darwin freebsd solaris
package main

View File

@@ -0,0 +1,18 @@
// +build solaris
package main
import "github.com/containerd/containerd/server"
func defaultConfig() *server.Config {
return &server.Config{
Root: "/var/lib/containerd",
GRPC: server.GRPCConfig{
Address: server.DefaultAddress,
},
Debug: server.Debug{
Level: "info",
Address: server.DefaultDebugAddress,
},
}
}

View File

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

View File

@@ -1,4 +1,4 @@
// +build darwin freebsd
// +build darwin freebsd solaris
package main

View File

@@ -1,4 +1,4 @@
// +build darwin freebsd
// +build darwin freebsd solaris
package main