From ae5d41b696ad59ee52791bb64d6923e0106ebba5 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Sat, 4 Apr 2015 08:59:29 -0700 Subject: [PATCH] Make console version different from OS version --- config/default.go | 2 +- config/types.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/default.go b/config/default.go index a0756870..e6fb2592 100644 --- a/config/default.go +++ b/config/default.go @@ -279,7 +279,7 @@ func NewConfig() *Config { "ubuntu-console": { SystemContainers: map[string]*project.ServiceConfig{ "console": { - Image: "rancher/ubuntuconsole:" + VERSION, + Image: "rancher/ubuntuconsole:" + IMAGE_VERSION, Privileged: true, Labels: []string{ DETACH + "=true", diff --git a/config/types.go b/config/types.go index 33161c9c..de6c931d 100644 --- a/config/types.go +++ b/config/types.go @@ -26,6 +26,7 @@ const ( var ( VERSION string + IMAGE_VERSION string CloudConfigFile = "/var/lib/rancher/conf/cloud-config-rancher.yml" ConfigFile = "/var/lib/rancher/conf/rancher.yml" PrivateConfigFile = "/var/lib/rancher/conf/rancher-private.yml" @@ -120,4 +121,7 @@ func init() { if VERSION == "" { VERSION = "v0.0.0-dev" } + if IMAGE_VERSION == "" { + IMAGE_VERSION = "v0.2.1" + } }