diff --git a/cmd/control/service.go b/cmd/control/service.go index 7b6f2e0e..dabf74d4 100644 --- a/cmd/control/service.go +++ b/cmd/control/service.go @@ -23,7 +23,7 @@ func (p *projectFactory) Create(c *cli.Context) (*project.Project, error) { return nil, err } - return compose.GetProject(cfg) + return compose.GetProject(cfg, true) } func beforeApp(c *cli.Context) error { diff --git a/cmd/userdocker/main.go b/cmd/userdocker/main.go index a20fcda3..f9198d0a 100644 --- a/cmd/userdocker/main.go +++ b/cmd/userdocker/main.go @@ -53,7 +53,7 @@ func enter(cfg *config.CloudConfig) error { log.Infof("Starting Docker in context: %s", context) - p, err := compose.GetProject(cfg) + p, err := compose.GetProject(cfg, true) if err != nil { return err } diff --git a/compose/project.go b/compose/project.go index b1902ecd..76bb0258 100644 --- a/compose/project.go +++ b/compose/project.go @@ -40,17 +40,8 @@ func RunServiceSet(name string, cfg *config.CloudConfig, configs map[string]*pro return p, p.Up() } -func RunServices(cfg *config.CloudConfig) error { - p, err := newCoreServiceProject(cfg) - if err != nil { - return err - } - - return p.Up() -} - -func GetProject(cfg *config.CloudConfig) (*project.Project, error) { - return newCoreServiceProject(cfg) +func GetProject(cfg *config.CloudConfig, networkingAvailable bool) (*project.Project, error) { + return newCoreServiceProject(cfg, networkingAvailable) } func newProject(name string, cfg *config.CloudConfig) (*project.Project, error) { @@ -102,8 +93,7 @@ func addServices(p *project.Project, enabled map[interface{}]interface{}, config return enabled } -func newCoreServiceProject(cfg *config.CloudConfig) (*project.Project, error) { - network := false +func newCoreServiceProject(cfg *config.CloudConfig, network bool) (*project.Project, error) { projectEvents := make(chan project.ProjectEvent) enabled := map[interface{}]interface{}{} diff --git a/init/sysinit.go b/init/sysinit.go index b4effc3e..59c7b63a 100644 --- a/init/sysinit.go +++ b/init/sysinit.go @@ -98,7 +98,11 @@ func SysInit() error { _, err = config.ChainCfgFuncs(cfg, loadImages, func(cfg *config.CloudConfig) (*config.CloudConfig, error) { - return cfg, compose.RunServices(cfg) + p, err := compose.GetProject(cfg, false) + if err != nil { + return cfg, err + } + return cfg, p.Up() }, func(cfg *config.CloudConfig) (*config.CloudConfig, error) { syscall.Sync()