Compare commits

...

9 Commits

Author SHA1 Message Date
Ivan Mikushin
bd2ab6c218 v0.3.2 2015-07-01 16:24:36 +05:00
Ivan Mikushin
79f7d26cb6 Merge pull request #412 from imikushin/os-images-rc3
v0.3.2-rc3
2015-06-30 19:46:20 +05:00
Ivan Mikushin
81216c2af2 v0.3.2-rc3
use images v0.3.2-rc3 in os-config.yml
2015-06-30 19:29:10 +05:00
Ivan Mikushin
2aa23047e8 Merge pull request #410 from imikushin/version-fix
set VERSION to v0.3.2-rc2
2015-06-30 13:02:07 +05:00
Ivan Mikushin
7995541ce1 set VERSION to v0.3.2-rc2 2015-06-30 12:36:21 +05:00
Ivan Mikushin
6f1c99a1a9 Merge pull request #409 from imikushin/os-services-fix
get services from os-services branch v0.3.2
2015-06-30 11:03:21 +05:00
Ivan Mikushin
3223dad3b0 get services from os-services branch v0.3.2 2015-06-30 10:36:19 +05:00
Ivan Mikushin
44b822b4bb Merge pull request #408 from imikushin/rancher-volume
fix Rancher persistence problem
2015-06-30 10:33:38 +05:00
Ivan Mikushin
35f001b4b8 fix Rancher persistence problem 2015-06-30 09:46:23 +05:00
2 changed files with 2 additions and 6 deletions

View File

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

View File

@@ -36,7 +36,7 @@ network:
address: 127.0.0.1/8
repositories:
core:
url: https://raw.githubusercontent.com/rancherio/os-services/v0.3.1
url: https://raw.githubusercontent.com/rancherio/os-services/v0.3.2
state:
fstype: auto
dev: LABEL=RANCHER_STATE
@@ -327,6 +327,7 @@ system_containers:
volumes:
- /dev:/host/dev
- /os-config.yml:/os-config.yml
- /var/lib/rancher:/var/lib/rancher
- /var/lib/rancher/conf:/var/lib/rancher/conf
- /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher
- /lib/modules:/lib/modules