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

Use docker images for the current architecture (vs just for amd64)

Browse Source 
Fix #828, #835
This commit is contained in:
Ivan Mikushin
2016-03-28 13:50:29 -07:00
parent 5f362d78a2
commit ee9c21c5f1
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/control/install.go
View File

@@ -63,7 +63,7 @@ func installAction(c *cli.Context) {
log.WithFields(log.Fields{"err": err}).Fatal("ros install: failed to load config")
}
if image == "" {
image = cfg.Rancher.Upgrade.Image + ":" + config.VERSION
image = cfg.Rancher.Upgrade.Image + ":" + config.VERSION + config.SUFFIX
}
installType := c.String("install-type")

2
cmd/control/selinux.go
View File

@@ -49,7 +49,7 @@ func selinuxCommand() cli.Command {
"-v", "/etc/selinux:/etc/selinux",
"-v", "/var/lib/selinux:/var/lib/selinux",
"-v", "/usr/share/selinux:/usr/share/selinux",
fmt.Sprintf("rancher/os-selinuxtools:%s", config.VERSION), "bash"}
fmt.Sprintf("rancher/os-selinuxtools:%s", config.VERSION + config.SUFFIX), "bash"}
syscall.Exec("/bin/system-docker", argv, []string{})
}