rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 07:15:41 +00:00
Code Issues Releases Wiki Activity

Refactor how consoles and engines are loaded

Browse Source
This commit is contained in:
Josh Curl
2016-09-15 16:12:15 -07:00
parent 5987d713a4
commit cf998978a8
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/control/engine.go
View File

@@ -10,7 +10,6 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
composeConfig "github.com/docker/libcompose/config"
"github.com/docker/libcompose/project/options"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
@@ -68,9 +67,7 @@ func engineSwitch(c *cli.Context) error {
log.Fatal(err)
}
project.ServiceConfigs.Add("docker", &composeConfig.ServiceConfig{})
if err = compose.LoadService(project, cfg, true, newEngine); err != nil {
if err = compose.LoadSpecialService(project, cfg, "docker", newEngine); err != nil {
log.Fatal(err)
}