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

Show current/enabled/disabled in 'ros engine list'

Browse Source
This commit is contained in:
Josh Curl
2016-08-17 16:33:49 -07:00
parent a81be13f82
commit 11cf2a195b
6 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compose/reload.go
View File

@@ -68,7 +68,7 @@ func projectReload(p *project.Project, useNetwork *bool, loadConsole bool, envir
}
}
if cfg.Rancher.Docker.Engine != "" {
if cfg.Rancher.Docker.Engine != "" && cfg.Rancher.Docker.Engine != cfg.Rancher.Defaults.Docker.Engine {
p.ServiceConfigs.Add("docker", &composeConfig.ServiceConfig{})
if err := LoadService(p, cfg, *useNetwork, cfg.Rancher.Docker.Engine); err != nil && err != network.ErrNoNetwork {
log.Error(err)