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

Merge pull request #783 from joshwget/fix-upgrade-stage

Browse Source 
Only run upgrade container once
This commit is contained in:
Darren Shepherd 2016-02-26 15:34:25 -07:00
commit e861ae65ca
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/control/os.go
View File

@ -201,7 +201,7 @@ func startUpgradeContainer(image string, stage, force, reboot bool) error {
} }
} }
if err := container.Start(); err != nil { if err := container.Up(); err != nil {
return err return err
} }
@ -209,10 +209,6 @@ func startUpgradeContainer(image string, stage, force, reboot bool) error {
return err return err
} }
if err := container.Up(); err != nil {
return err
}
if err := container.Delete(); err != nil { if err := container.Delete(); err != nil {
return err return err
} }

13
compose/project.go
View File

@ -20,7 +20,7 @@ func CreateService(cfg *config.CloudConfig, name string, serviceConfig *project.
} }
} }
p, err := RunServiceSet("once", cfg, map[string]*project.ServiceConfig{ p, err := CreateServiceSet("once", cfg, map[string]*project.ServiceConfig{
name: serviceConfig, name: serviceConfig,
}) })
if err != nil { if err != nil {
@ -30,7 +30,7 @@ func CreateService(cfg *config.CloudConfig, name string, serviceConfig *project.
return p.CreateService(name) return p.CreateService(name)
} }
func RunServiceSet(name string, cfg *config.CloudConfig, configs map[string]*project.ServiceConfig) (*project.Project, error) { func CreateServiceSet(name string, cfg *config.CloudConfig, configs map[string]*project.ServiceConfig) (*project.Project, error) {
p, err := newProject(name, cfg) p, err := newProject(name, cfg)
if err != nil { if err != nil {
return nil, err return nil, err
@ -38,6 +38,15 @@ func RunServiceSet(name string, cfg *config.CloudConfig, configs map[string]*pro
addServices(p, map[interface{}]interface{}{}, configs) addServices(p, map[interface{}]interface{}{}, configs)
return p, nil
}
func RunServiceSet(name string, cfg *config.CloudConfig, configs map[string]*project.ServiceConfig) (*project.Project, error) {
p, err := CreateServiceSet(name, cfg, configs)
if err != nil {
return nil, err
}
return p, p.Up() return p, p.Up()
} }