1
0
mirror of https://github.com/rancher/os.git synced 2025-07-04 10:36:14 +00:00

Make console version different from OS version

This commit is contained in:
Darren Shepherd 2015-04-04 08:59:29 -07:00
parent 4524251129
commit ae5d41b696
2 changed files with 5 additions and 1 deletions

View File

@ -279,7 +279,7 @@ func NewConfig() *Config {
"ubuntu-console": { "ubuntu-console": {
SystemContainers: map[string]*project.ServiceConfig{ SystemContainers: map[string]*project.ServiceConfig{
"console": { "console": {
Image: "rancher/ubuntuconsole:" + VERSION, Image: "rancher/ubuntuconsole:" + IMAGE_VERSION,
Privileged: true, Privileged: true,
Labels: []string{ Labels: []string{
DETACH + "=true", DETACH + "=true",

View File

@ -26,6 +26,7 @@ const (
var ( var (
VERSION string VERSION string
IMAGE_VERSION string
CloudConfigFile = "/var/lib/rancher/conf/cloud-config-rancher.yml" CloudConfigFile = "/var/lib/rancher/conf/cloud-config-rancher.yml"
ConfigFile = "/var/lib/rancher/conf/rancher.yml" ConfigFile = "/var/lib/rancher/conf/rancher.yml"
PrivateConfigFile = "/var/lib/rancher/conf/rancher-private.yml" PrivateConfigFile = "/var/lib/rancher/conf/rancher-private.yml"
@ -120,4 +121,7 @@ func init() {
if VERSION == "" { if VERSION == "" {
VERSION = "v0.0.0-dev" VERSION = "v0.0.0-dev"
} }
if IMAGE_VERSION == "" {
IMAGE_VERSION = "v0.2.1"
}
} }