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

Merge pull request #409 from imikushin/os-services-fix

Browse Source 
get services from os-services branch v0.3.2
This commit is contained in:
Ivan Mikushin 2015-06-30 11:03:21 +05:00
commit 6f1c99a1a9
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/types.go
View File

@ -3,7 +3,6 @@ package config
import "github.com/rancherio/rancher-compose/librcompose/project" import "github.com/rancherio/rancher-compose/librcompose/project"
const ( const (
DEFAULT_IMAGE_VERSION = "v0.3.1"
CONSOLE_CONTAINER = "console" CONSOLE_CONTAINER = "console"
DOCKER_BIN = "/usr/bin/docker" DOCKER_BIN = "/usr/bin/docker"
DOCKER_SYSTEM_HOME = "/var/lib/system-docker" DOCKER_SYSTEM_HOME = "/var/lib/system-docker"
@ -29,7 +28,6 @@ const (
var ( var (
VERSION string VERSION string
IMAGE_VERSION string
OsConfigFile = "/os-config.yml" OsConfigFile = "/os-config.yml"
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"
@ -136,7 +134,4 @@ func init() {
if VERSION == "" { if VERSION == "" {
VERSION = "v0.0.0-dev" VERSION = "v0.0.0-dev"
} }
if IMAGE_VERSION == "" {
IMAGE_VERSION = DEFAULT_IMAGE_VERSION
}
} }

2
os-config.yml
View File

@ -36,7 +36,7 @@ network:
address: 127.0.0.1/8 address: 127.0.0.1/8
repositories: repositories:
core: core:
url: https://raw.githubusercontent.com/rancherio/os-services/v0.3.1 url: https://raw.githubusercontent.com/rancherio/os-services/v0.3.2
state: state:
fstype: auto fstype: auto
dev: LABEL=RANCHER_STATE dev: LABEL=RANCHER_STATE