mirror of
https://github.com/rancher/os.git
synced 2025-07-14 07:04:03 +00:00
Merge pull request #688 from imikushin/bump-dev-ver
Bump dev version to v0.4.3-dev
This commit is contained in:
commit
d57c9ecd81
@ -1,5 +1,5 @@
|
|||||||
IMAGE_NAME=rancher/os
|
IMAGE_NAME=rancher/os
|
||||||
VERSION=v0.4.2-dev
|
VERSION=v0.4.3-dev
|
||||||
|
|
||||||
DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.9.1-ros1/docker-1.9.1
|
DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.9.1-ros1/docker-1.9.1
|
||||||
COMPILED_KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.2.0-16.19/linux-4.2.3-rancher-x86.tar.gz
|
COMPILED_KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.2.0-16.19/linux-4.2.3-rancher-x86.tar.gz
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
rancher:
|
rancher:
|
||||||
bootstrap:
|
bootstrap:
|
||||||
udev-bootstrap:
|
udev-bootstrap:
|
||||||
image: rancher/os-udev:v0.4.2-dev
|
image: rancher/os-udev:v0.4.3-dev
|
||||||
environment:
|
environment:
|
||||||
- BOOTSTRAP=true
|
- BOOTSTRAP=true
|
||||||
labels:
|
labels:
|
||||||
@ -17,7 +17,7 @@ rancher:
|
|||||||
- /lib/firmware:/lib/firmware
|
- /lib/firmware:/lib/firmware
|
||||||
autoformat:
|
autoformat:
|
||||||
autoformat:
|
autoformat:
|
||||||
image: rancher/os-autoformat:v0.4.2-dev
|
image: rancher/os-autoformat:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: "false"
|
io.rancher.os.detach: "false"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -25,7 +25,7 @@ rancher:
|
|||||||
net: none
|
net: none
|
||||||
privileged: true
|
privileged: true
|
||||||
udev-autoformat:
|
udev-autoformat:
|
||||||
image: rancher/os-udev:v0.4.2-dev
|
image: rancher/os-udev:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: "false"
|
io.rancher.os.detach: "false"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -54,13 +54,13 @@ 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.2-dev
|
url: https://raw.githubusercontent.com/rancher/os-services/v0.4.3-dev
|
||||||
state:
|
state:
|
||||||
fstype: auto
|
fstype: auto
|
||||||
dev: LABEL=RANCHER_STATE
|
dev: LABEL=RANCHER_STATE
|
||||||
services:
|
services:
|
||||||
acpid:
|
acpid:
|
||||||
image: rancher/os-acpid:v0.4.2-dev
|
image: rancher/os-acpid:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
net: host
|
net: host
|
||||||
@ -70,7 +70,7 @@ rancher:
|
|||||||
- command-volumes
|
- command-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
all-volumes:
|
all-volumes:
|
||||||
image: rancher/os-state:v0.4.2-dev
|
image: rancher/os-state:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.createonly: "true"
|
io.rancher.os.createonly: "true"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -84,7 +84,7 @@ rancher:
|
|||||||
- user-volumes
|
- user-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
cloud-init:
|
cloud-init:
|
||||||
image: rancher/os-cloudinit:v0.4.2-dev
|
image: rancher/os-cloudinit:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: "false"
|
io.rancher.os.detach: "false"
|
||||||
io.rancher.os.reloadconfig: "true"
|
io.rancher.os.reloadconfig: "true"
|
||||||
@ -97,7 +97,7 @@ rancher:
|
|||||||
- command-volumes
|
- command-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
cloud-init-pre:
|
cloud-init-pre:
|
||||||
image: rancher/os-cloudinit:v0.4.2-dev
|
image: rancher/os-cloudinit:v0.4.3-dev
|
||||||
environment:
|
environment:
|
||||||
- CLOUD_INIT_NETWORK=false
|
- CLOUD_INIT_NETWORK=false
|
||||||
labels:
|
labels:
|
||||||
@ -112,7 +112,7 @@ rancher:
|
|||||||
- command-volumes
|
- command-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
command-volumes:
|
command-volumes:
|
||||||
image: rancher/os-state:v0.4.2-dev
|
image: rancher/os-state:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.createonly: "true"
|
io.rancher.os.createonly: "true"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -136,7 +136,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.2-dev
|
image: rancher/os-console:v0.4.3-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
|
||||||
@ -152,7 +152,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.2-dev
|
image: rancher/os-state:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.createonly: "true"
|
io.rancher.os.createonly: "true"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -164,7 +164,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.2-dev
|
image: rancher/os-network:v0.4.3-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
|
||||||
@ -176,7 +176,7 @@ rancher:
|
|||||||
- command-volumes
|
- command-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
wait-for-network:
|
wait-for-network:
|
||||||
image: rancher/os-network:v0.4.2-dev
|
image: rancher/os-network:v0.4.3-dev
|
||||||
command: wait-for-network
|
command: wait-for-network
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: "false"
|
io.rancher.os.detach: "false"
|
||||||
@ -188,7 +188,7 @@ rancher:
|
|||||||
- command-volumes
|
- command-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
ntp:
|
ntp:
|
||||||
image: rancher/os-ntp:v0.4.2-dev
|
image: rancher/os-ntp:v0.4.3-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
|
||||||
@ -197,7 +197,7 @@ rancher:
|
|||||||
privileged: true
|
privileged: true
|
||||||
restart: always
|
restart: always
|
||||||
preload-system-images:
|
preload-system-images:
|
||||||
image: rancher/os-preload:v0.4.2-dev
|
image: rancher/os-preload:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: "false"
|
io.rancher.os.detach: "false"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -209,7 +209,7 @@ rancher:
|
|||||||
- command-volumes
|
- command-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
preload-user-images:
|
preload-user-images:
|
||||||
image: rancher/os-preload:v0.4.2-dev
|
image: rancher/os-preload:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.detach: "false"
|
io.rancher.os.detach: "false"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -222,7 +222,7 @@ rancher:
|
|||||||
- command-volumes
|
- command-volumes
|
||||||
- system-volumes
|
- system-volumes
|
||||||
syslog:
|
syslog:
|
||||||
image: rancher/os-syslog:v0.4.2-dev
|
image: rancher/os-syslog:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
log_driver: json-file
|
log_driver: json-file
|
||||||
@ -233,7 +233,7 @@ rancher:
|
|||||||
volumes_from:
|
volumes_from:
|
||||||
- system-volumes
|
- system-volumes
|
||||||
system-volumes:
|
system-volumes:
|
||||||
image: rancher/os-state:v0.4.2-dev
|
image: rancher/os-state:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.createonly: "true"
|
io.rancher.os.createonly: "true"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -257,7 +257,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.2-dev
|
image: rancher/os-udev:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
io.rancher.os.before: udev
|
io.rancher.os.before: udev
|
||||||
@ -267,7 +267,7 @@ rancher:
|
|||||||
volumes_from:
|
volumes_from:
|
||||||
- system-volumes
|
- system-volumes
|
||||||
udev:
|
udev:
|
||||||
image: rancher/os-udev:v0.4.2-dev
|
image: rancher/os-udev:v0.4.3-dev
|
||||||
environment:
|
environment:
|
||||||
- DAEMON=true
|
- DAEMON=true
|
||||||
labels:
|
labels:
|
||||||
@ -280,7 +280,7 @@ rancher:
|
|||||||
volumes_from:
|
volumes_from:
|
||||||
- system-volumes
|
- system-volumes
|
||||||
user-volumes:
|
user-volumes:
|
||||||
image: rancher/os-state:v0.4.2-dev
|
image: rancher/os-state:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.createonly: "true"
|
io.rancher.os.createonly: "true"
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
@ -292,7 +292,7 @@ rancher:
|
|||||||
- /home:/home
|
- /home:/home
|
||||||
- /opt:/opt
|
- /opt:/opt
|
||||||
docker:
|
docker:
|
||||||
image: rancher/os-docker:v0.4.2-dev
|
image: rancher/os-docker:v0.4.3-dev
|
||||||
labels:
|
labels:
|
||||||
io.rancher.os.scope: system
|
io.rancher.os.scope: system
|
||||||
io.rancher.os.after: console
|
io.rancher.os.after: console
|
||||||
|
Loading…
Reference in New Issue
Block a user