rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-19 09:22:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #765 from imikushin/bump-dev-version

Browse Source 
v0.4.4-dev
This commit is contained in:
Ivan Mikushin
2016-02-16 14:43:25 -08:00
parent 96b52c6cad bb62a71a93
commit ba5e4471b7
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.conf
View File

@@ -1,3 +1,3 @@
IMAGE_NAME=rancher/os IMAGE_NAME=rancher/os
VERSION=v0.4.3-dev VERSION=v0.4.4-dev
DFS_IMAGE=rancher/docker:v1.10.1 DFS_IMAGE=rancher/docker:v1.10.1

46
os-config.yml
View File

@@ -2,7 +2,7 @@ hostname: rancher
rancher: rancher:
bootstrap: bootstrap:
state-script: state-script:
image: rancher/os-statescript:v0.4.3-dev image: rancher/os-statescript:v0.4.4-dev
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -18,7 +18,7 @@ rancher:
- /usr/bin/ros:/usr/bin/ros:ro - /usr/bin/ros:/usr/bin/ros:ro
- /usr/share/ros:/usr/share/ros:ro - /usr/share/ros:/usr/share/ros:ro
udev-bootstrap: udev-bootstrap:
image: rancher/os-udev:v0.4.3-dev image: rancher/os-udev:v0.4.4-dev
environment: environment:
- BOOTSTRAP=true - BOOTSTRAP=true
labels: labels:
@@ -34,7 +34,7 @@ rancher:
- /lib/firmware:/lib/firmware - /lib/firmware:/lib/firmware
autoformat: autoformat:
autoformat: autoformat:
image: rancher/os-autoformat:v0.4.3-dev image: rancher/os-autoformat:v0.4.4-dev
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -42,7 +42,7 @@ rancher:
net: none net: none
privileged: true privileged: true
udev-autoformat: udev-autoformat:
image: rancher/os-udev:v0.4.3-dev image: rancher/os-udev:v0.4.4-dev
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -66,7 +66,7 @@ rancher:
nameservers: [8.8.8.8, 8.8.4.4] nameservers: [8.8.8.8, 8.8.4.4]
repositories: repositories:
core: core:
url: https://raw.githubusercontent.com/rancher/os-services/v0.4.3-dev url: https://raw.githubusercontent.com/rancher/os-services/v0.4.4-dev
state: state:
fstype: auto fstype: auto
dev: LABEL=RANCHER_STATE dev: LABEL=RANCHER_STATE
@@ -74,7 +74,7 @@ rancher:
oem_dev: LABEL=RANCHER_OEM oem_dev: LABEL=RANCHER_OEM
services: services:
acpid: acpid:
image: rancher/os-acpid:v0.4.3-dev image: rancher/os-acpid:v0.4.4-dev
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
net: host net: host
@@ -84,7 +84,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
all-volumes: all-volumes:
image: rancher/os-state:v0.4.3-dev image: rancher/os-state:v0.4.4-dev
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -98,7 +98,7 @@ rancher:
- user-volumes - user-volumes
- system-volumes - system-volumes
cloud-init: cloud-init:
image: rancher/os-cloudinit:v0.4.3-dev image: rancher/os-cloudinit:v0.4.4-dev
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.reloadconfig: "true" io.rancher.os.reloadconfig: "true"
@@ -111,7 +111,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
cloud-init-pre: cloud-init-pre:
image: rancher/os-cloudinit:v0.4.3-dev image: rancher/os-cloudinit:v0.4.4-dev
environment: environment:
- CLOUD_INIT_NETWORK=false - CLOUD_INIT_NETWORK=false
labels: labels:
@@ -126,7 +126,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
command-volumes: command-volumes:
image: rancher/os-state:v0.4.3-dev image: rancher/os-state:v0.4.4-dev
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -150,7 +150,7 @@ rancher:
- /usr/bin/ros:/usr/sbin/wait-for-network:ro - /usr/bin/ros:/usr/sbin/wait-for-network:ro
- /usr/bin/ros:/usr/sbin/wait-for-docker:ro - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
console: console:
image: rancher/os-console:v0.4.3-dev image: rancher/os-console:v0.4.4-dev
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: cloud-init io.rancher.os.after: cloud-init
@@ -166,7 +166,7 @@ rancher:
volumes: volumes:
- /usr/bin/iptables:/sbin/iptables:ro - /usr/bin/iptables:/sbin/iptables:ro
container-data-volumes: container-data-volumes:
image: rancher/os-state:v0.4.3-dev image: rancher/os-state:v0.4.4-dev
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -178,7 +178,7 @@ rancher:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /var/lib/rkt:/var/lib/rkt - /var/lib/rkt:/var/lib/rkt
network: network:
image: rancher/os-network:v0.4.3-dev image: rancher/os-network:v0.4.4-dev
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: cloud-init-pre io.rancher.os.after: cloud-init-pre
@@ -190,7 +190,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
wait-for-network: wait-for-network:
image: rancher/os-network:v0.4.3-dev image: rancher/os-network:v0.4.4-dev
command: wait-for-network command: wait-for-network
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
@@ -202,7 +202,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
ntp: ntp:
image: rancher/os-ntp:v0.4.3-dev image: rancher/os-ntp:v0.4.4-dev
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: cloud-init, wait-for-network io.rancher.os.after: cloud-init, wait-for-network
@@ -211,7 +211,7 @@ rancher:
privileged: true privileged: true
restart: always restart: always
preload-system-images: preload-system-images:
image: rancher/os-preload:v0.4.3-dev image: rancher/os-preload:v0.4.4-dev
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -223,7 +223,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
preload-user-images: preload-user-images:
image: rancher/os-preload:v0.4.3-dev image: rancher/os-preload:v0.4.4-dev
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -236,7 +236,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
syslog: syslog:
image: rancher/os-syslog:v0.4.3-dev image: rancher/os-syslog:v0.4.4-dev
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
log_driver: json-file log_driver: json-file
@@ -247,7 +247,7 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
system-volumes: system-volumes:
image: rancher/os-state:v0.4.3-dev image: rancher/os-state:v0.4.4-dev
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -271,7 +271,7 @@ rancher:
- /var/log:/var/log - /var/log:/var/log
- /var/run:/var/run - /var/run:/var/run
udev-cold: udev-cold:
image: rancher/os-udev:v0.4.3-dev image: rancher/os-udev:v0.4.4-dev
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.before: udev io.rancher.os.before: udev
@@ -281,7 +281,7 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
udev: udev:
image: rancher/os-udev:v0.4.3-dev image: rancher/os-udev:v0.4.4-dev
environment: environment:
- DAEMON=true - DAEMON=true
labels: labels:
@@ -294,7 +294,7 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
user-volumes: user-volumes:
image: rancher/os-state:v0.4.3-dev image: rancher/os-state:v0.4.4-dev
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -306,7 +306,7 @@ rancher:
- /home:/home - /home:/home
- /opt:/opt - /opt:/opt
docker: docker:
image: rancher/os-docker:v0.4.3-dev image: rancher/os-docker:v0.4.4-dev
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: console io.rancher.os.after: console

44
os-config_arm.yml
View File

@@ -2,7 +2,7 @@ hostname: rancher
rancher: rancher:
bootstrap: bootstrap:
state-script: state-script:
image: rancher/os-statescript:v0.4.3-dev_arm image: rancher/os-statescript:v0.4.4-dev_arm
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -18,7 +18,7 @@ rancher:
- /usr/bin/ros:/usr/bin/ros:ro - /usr/bin/ros:/usr/bin/ros:ro
- /usr/share/ros:/usr/share/ros:ro - /usr/share/ros:/usr/share/ros:ro
udev-bootstrap: udev-bootstrap:
image: rancher/os-udev:v0.4.3-dev_arm image: rancher/os-udev:v0.4.4-dev_arm
environment: environment:
- BOOTSTRAP=true - BOOTSTRAP=true
labels: labels:
@@ -34,7 +34,7 @@ rancher:
- /lib/firmware:/lib/firmware - /lib/firmware:/lib/firmware
autoformat: autoformat:
autoformat: autoformat:
image: rancher/os-autoformat:v0.4.3-dev_arm image: rancher/os-autoformat:v0.4.4-dev_arm
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -42,7 +42,7 @@ rancher:
net: none net: none
privileged: true privileged: true
udev-autoformat: udev-autoformat:
image: rancher/os-udev:v0.4.3-dev_arm image: rancher/os-udev:v0.4.4-dev_arm
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -71,7 +71,7 @@ rancher:
address: 127.0.0.1/8 address: 127.0.0.1/8
repositories: repositories:
core: core:
url: https://raw.githubusercontent.com/rancher/os-services/v0.4.3-dev_arm url: https://raw.githubusercontent.com/rancher/os-services/v0.4.4-dev_arm
state: state:
fstype: auto fstype: auto
dev: LABEL=RANCHER_STATE dev: LABEL=RANCHER_STATE
@@ -79,7 +79,7 @@ rancher:
oem_dev: LABEL=RANCHER_OEM oem_dev: LABEL=RANCHER_OEM
services: services:
all-volumes: all-volumes:
image: rancher/os-state:v0.4.3-dev_arm image: rancher/os-state:v0.4.4-dev_arm
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -93,7 +93,7 @@ rancher:
- user-volumes - user-volumes
- system-volumes - system-volumes
cloud-init: cloud-init:
image: rancher/os-cloudinit:v0.4.3-dev_arm image: rancher/os-cloudinit:v0.4.4-dev_arm
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.reloadconfig: "true" io.rancher.os.reloadconfig: "true"
@@ -106,7 +106,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
cloud-init-pre: cloud-init-pre:
image: rancher/os-cloudinit:v0.4.3-dev_arm image: rancher/os-cloudinit:v0.4.4-dev_arm
environment: environment:
- CLOUD_INIT_NETWORK=false - CLOUD_INIT_NETWORK=false
labels: labels:
@@ -121,7 +121,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
command-volumes: command-volumes:
image: rancher/os-state:v0.4.3-dev_arm image: rancher/os-state:v0.4.4-dev_arm
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -145,7 +145,7 @@ rancher:
- /usr/bin/ros:/usr/sbin/wait-for-network:ro - /usr/bin/ros:/usr/sbin/wait-for-network:ro
- /usr/bin/ros:/usr/sbin/wait-for-docker:ro - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
console: console:
image: rancher/os-console:v0.4.3-dev_arm image: rancher/os-console:v0.4.4-dev_arm
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: cloud-init io.rancher.os.after: cloud-init
@@ -161,7 +161,7 @@ rancher:
volumes: volumes:
- /usr/bin/iptables:/sbin/iptables:ro - /usr/bin/iptables:/sbin/iptables:ro
container-data-volumes: container-data-volumes:
image: rancher/os-state:v0.4.3-dev_arm image: rancher/os-state:v0.4.4-dev_arm
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -173,7 +173,7 @@ rancher:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /var/lib/rkt:/var/lib/rkt - /var/lib/rkt:/var/lib/rkt
network: network:
image: rancher/os-network:v0.4.3-dev_arm image: rancher/os-network:v0.4.4-dev_arm
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: cloud-init-pre io.rancher.os.after: cloud-init-pre
@@ -185,7 +185,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
wait-for-network: wait-for-network:
image: rancher/os-network:v0.4.3-dev_arm image: rancher/os-network:v0.4.4-dev_arm
command: wait-for-network command: wait-for-network
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
@@ -197,7 +197,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
ntp: ntp:
image: rancher/os-ntp:v0.4.3-dev_arm image: rancher/os-ntp:v0.4.4-dev_arm
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: cloud-init, wait-for-network io.rancher.os.after: cloud-init, wait-for-network
@@ -206,7 +206,7 @@ rancher:
privileged: true privileged: true
restart: always restart: always
preload-system-images: preload-system-images:
image: rancher/os-preload:v0.4.3-dev_arm image: rancher/os-preload:v0.4.4-dev_arm
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -218,7 +218,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
preload-user-images: preload-user-images:
image: rancher/os-preload:v0.4.3-dev_arm image: rancher/os-preload:v0.4.4-dev_arm
labels: labels:
io.rancher.os.detach: "false" io.rancher.os.detach: "false"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -231,7 +231,7 @@ rancher:
- command-volumes - command-volumes
- system-volumes - system-volumes
syslog: syslog:
image: rancher/os-syslog:v0.4.3-dev_arm image: rancher/os-syslog:v0.4.4-dev_arm
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
log_driver: json-file log_driver: json-file
@@ -242,7 +242,7 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
system-volumes: system-volumes:
image: rancher/os-state:v0.4.3-dev_arm image: rancher/os-state:v0.4.4-dev_arm
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -266,7 +266,7 @@ rancher:
- /var/log:/var/log - /var/log:/var/log
- /var/run:/var/run - /var/run:/var/run
udev-cold: udev-cold:
image: rancher/os-udev:v0.4.3-dev_arm image: rancher/os-udev:v0.4.4-dev_arm
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.before: udev io.rancher.os.before: udev
@@ -276,7 +276,7 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
udev: udev:
image: rancher/os-udev:v0.4.3-dev_arm image: rancher/os-udev:v0.4.4-dev_arm
environment: environment:
- DAEMON=true - DAEMON=true
labels: labels:
@@ -289,7 +289,7 @@ rancher:
volumes_from: volumes_from:
- system-volumes - system-volumes
user-volumes: user-volumes:
image: rancher/os-state:v0.4.3-dev_arm image: rancher/os-state:v0.4.4-dev_arm
labels: labels:
io.rancher.os.createonly: "true" io.rancher.os.createonly: "true"
io.rancher.os.scope: system io.rancher.os.scope: system
@@ -301,7 +301,7 @@ rancher:
- /home:/home - /home:/home
- /opt:/opt - /opt:/opt
docker: docker:
image: rancher/os-docker:v0.4.3-dev_arm image: rancher/os-docker:v0.4.4-dev_arm
labels: labels:
io.rancher.os.scope: system io.rancher.os.scope: system
io.rancher.os.after: console io.rancher.os.after: console