alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up/make consistent the APIs for registering core components, make Docker an optional component at compile time (#1111)

Browse Source
This commit is contained in:
Owen Cliffe
2018-07-07 10:37:19 +01:00
committed by GitHub
parent cc468afeec
commit fff95e7992
15 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/agent/agent.go
View File

@@ -12,7 +12,6 @@ import (
"time"
"github.com/fnproject/fn/api/agent/drivers"
"github.com/fnproject/fn/api/agent/drivers/docker"
"github.com/fnproject/fn/api/agent/protocol"
"github.com/fnproject/fn/api/common"
"github.com/fnproject/fn/api/id"
@@ -142,7 +141,11 @@ func New(da CallHandler, options ...AgentOption) Agent {
logrus.Infof("agent starting cfg=%+v", a.cfg)
if a.driver == nil {
a.driver = NewDockerDriver(&a.cfg)
d, err := NewDockerDriver(&a.cfg)
if err != nil {
logrus.WithError(err).Fatal("failed to create docker driver ")
}
a.driver = d
}
a.resources = NewResourceTracker(&a.cfg)
@@ -201,8 +204,8 @@ func WithCallOverrider(fn CallOverrider) AgentOption {
}
// NewDockerDriver creates a default docker driver from agent config
func NewDockerDriver(cfg *AgentConfig) *docker.DockerDriver {
return docker.NewDocker(drivers.Config{
func NewDockerDriver(cfg *AgentConfig) (drivers.Driver, error) {
return drivers.New("docker", drivers.Config{
DockerNetworks: cfg.DockerNetworks,
ServerVersion: cfg.MinDockerVersion,
PreForkPoolSize: cfg.PreForkPoolSize,