rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

Refactor configuration to compose syntax

Browse Source
This commit is contained in:
Darren Shepherd
2015-03-29 02:57:15 -07:00
parent 38389b1f8e
commit c7ae14cc13
11 changed files with 535 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/control/reload.go
View File

@@ -8,26 +8,26 @@ import (
"github.com/rancherio/os/docker"
)
func parseContainers(cfg *config.Config) map[string]*docker.Container {
result := map[string]*docker.Container{}
for _, containerConfig := range cfg.SystemContainers {
container := docker.NewContainer(config.DOCKER_SYSTEM_HOST, &containerConfig)
if containerConfig.Id != "" {
result[containerConfig.Id] = container
}
}
return result
}
//func parseContainers(cfg *config.Config) map[string]*docker.Container {
// result := map[string]*docker.Container{}
//
// for _, containerConfig := range cfg.SystemContainers {
// container := docker.NewContainer(config.DOCKER_SYSTEM_HOST, &containerConfig)
// if containerConfig.Id != "" {
// result[containerConfig.Id] = container
// }
// }
//
// return result
//}
func reload(c *cli.Context) {
cfg, err := config.LoadConfig()
_, err := config.LoadConfig()
if err != nil {
log.Fatal(err)
}
containers := parseContainers(cfg)
containers := map[string]*docker.Container{} //parseContainers(cfg)
toStart := make([]*docker.Container, 0, len(c.Args()))
for _, id := range c.Args() {