rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-05 08:42:38 +00:00
Code Issues Releases Wiki Activity

Config ROS image prefix for install and all rancher/os services (#2272)

Browse Source
This commit is contained in:
niusmallnan
2018-03-06 18:07:21 +08:00
committed by GitHub
parent d263be4bae
commit f6a76a10ae
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/control/os.go
View File

@@ -117,7 +117,18 @@ func getImages() (*Images, error) {
}
}
return parseBody(body)
images, err := parseBody(body)
if err != nil {
return nil, err
}
cfg := config.LoadConfig()
images.Current = formatImage(images.Current, cfg)
for i := len(images.Available) - 1; i >= 0; i-- {
images.Available[i] = formatImage(images.Available[i], cfg)
}
return images, nil
}
func osMetaDataGet(c *cli.Context) error {
@@ -133,6 +144,7 @@ func osMetaDataGet(c *cli.Context) error {
cfg := config.LoadConfig()
runningName := cfg.Rancher.Upgrade.Image + ":" + config.Version
runningName = formatImage(runningName, cfg)
foundRunning := false
for i := len(images.Available) - 1; i >= 0; i-- {