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

revert master to v0.4.0-dev

Browse Source 
master branch should be a "-dev" version. let's tag rcs and releases versions on commits spawning off the branch
This commit is contained in:
Ivan Mikushin
2015-08-14 20:02:47 +05:00
parent 687beeca30
commit 4b5f68b0f6
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
os-config.yml
View File

@@ -1,7 +1,7 @@
rancher:
bootstrap:
udev-bootstrap:
image: rancher/os-udev:v0.4.0-rc1
image: rancher/os-udev:v0.4.0-dev
labels:
io.rancher.os.detach: false
io.rancher.os.scope: system
@@ -15,7 +15,7 @@ rancher:
- /lib/firmware:/lib/firmware
autoformat:
autoformat:
image: rancher/os-autoformat:v0.4.0-rc1
image: rancher/os-autoformat:v0.4.0-dev
labels:
io.rancher.os.detach: false
io.rancher.os.scope: system
@@ -23,7 +23,7 @@ rancher:
net: none
privileged: true
udev-autoformat:
image: rancher/os-udev:v0.4.0-rc1
image: rancher/os-udev:v0.4.0-dev
labels:
io.rancher.os.detach: false
io.rancher.os.scope: system
@@ -59,7 +59,7 @@ rancher:
dev: LABEL=RANCHER_STATE
services:
acpid:
image: rancher/os-acpid:v0.4.0-rc1
image: rancher/os-acpid:v0.4.0-dev
labels:
io.rancher.os.scope: system
net: host
@@ -69,7 +69,7 @@ rancher:
- command-volumes
- system-volumes
all-volumes:
image: rancher/os-state:v0.4.0-rc1
image: rancher/os-state:v0.4.0-dev
labels:
io.rancher.os.createonly: true
io.rancher.os.scope: system
@@ -83,7 +83,7 @@ rancher:
- user-volumes
- system-volumes
cloud-init:
image: rancher/os-cloudinit:v0.4.0-rc1
image: rancher/os-cloudinit:v0.4.0-dev
labels:
io.rancher.os.detach: false
io.rancher.os.reloadconfig: true
@@ -96,7 +96,7 @@ rancher:
- command-volumes
- system-volumes
cloud-init-pre:
image: rancher/os-cloudinit:v0.4.0-rc1
image: rancher/os-cloudinit:v0.4.0-dev
environment:
- CLOUD_INIT_NETWORK=false
labels:
@@ -111,7 +111,7 @@ rancher:
- command-volumes
- system-volumes
command-volumes:
image: rancher/os-state:v0.4.0-rc1
image: rancher/os-state:v0.4.0-dev
labels:
io.rancher.os.createonly: true
io.rancher.os.scope: system
@@ -134,7 +134,7 @@ rancher:
- /usr/bin/ros:/usr/bin/dockerlaunch:ro
- /usr/bin/docker:/usr/bin/docker.dist:ro
console:
image: rancher/os-console:v0.4.0-rc1
image: rancher/os-console:v0.4.0-dev
labels:
io.rancher.os.scope: system
io.rancher.os.after: cloud-init
@@ -147,7 +147,7 @@ rancher:
volumes_from:
- all-volumes
docker-volumes:
image: rancher/os-state:v0.4.0-rc1
image: rancher/os-state:v0.4.0-dev
labels:
io.rancher.os.createonly: true
io.rancher.os.scope: system
@@ -158,7 +158,7 @@ rancher:
volumes:
- /var/lib/docker:/var/lib/docker
network:
image: rancher/os-network:v0.4.0-rc1
image: rancher/os-network:v0.4.0-dev
labels:
io.rancher.os.detach: false
io.rancher.os.scope: system
@@ -170,7 +170,7 @@ rancher:
- command-volumes
- system-volumes
ntp:
image: rancher/os-ntp:v0.4.0-rc1
image: rancher/os-ntp:v0.4.0-dev
labels:
io.rancher.os.scope: system
io.rancher.os.after: cloud-init, network
@@ -179,7 +179,7 @@ rancher:
privileged: true
restart: always
preload-system-images:
image: rancher/os-preload:v0.4.0-rc1
image: rancher/os-preload:v0.4.0-dev
labels:
io.rancher.os.detach: false
io.rancher.os.scope: system
@@ -191,7 +191,7 @@ rancher:
- command-volumes
- system-volumes
preload-user-images:
image: rancher/os-preload:v0.4.0-rc1
image: rancher/os-preload:v0.4.0-dev
labels:
io.rancher.os.detach: false
io.rancher.os.scope: system
@@ -204,7 +204,7 @@ rancher:
- command-volumes
- system-volumes
syslog:
image: rancher/os-syslog:v0.4.0-rc1
image: rancher/os-syslog:v0.4.0-dev
labels:
io.rancher.os.scope: system
log_driver: json-file
@@ -215,7 +215,7 @@ rancher:
volumes_from:
- system-volumes
system-volumes:
image: rancher/os-state:v0.4.0-rc1
image: rancher/os-state:v0.4.0-dev
labels:
io.rancher.os.createonly: true
io.rancher.os.scope: system
@@ -235,7 +235,7 @@ rancher:
- /var/run:/var/run
- /var/log:/var/log
udev-cold:
image: rancher/os-udev:v0.4.0-rc1
image: rancher/os-udev:v0.4.0-dev
labels:
io.rancher.os.scope: system
io.rancher.os.before: udev
@@ -245,7 +245,7 @@ rancher:
volumes_from:
- system-volumes
udev:
image: rancher/os-udev:v0.4.0-rc1
image: rancher/os-udev:v0.4.0-dev
environment:
- DAEMON=true
labels:
@@ -258,7 +258,7 @@ rancher:
volumes_from:
- system-volumes
user-volumes:
image: rancher/os-state:v0.4.0-rc1
image: rancher/os-state:v0.4.0-dev
labels:
io.rancher.os.createonly: true
io.rancher.os.scope: system

2
scripts/version
View File

@@ -1 +1 @@
VERSION=v0.4.0-rc1
VERSION=v0.4.0-dev