rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-29 08:16:49 +00:00
Code Issues Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
Ivan Mikushin 2015-06-29 23:32:36 +05:00
parent da2b12d840
commit c3bbd8886c
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
os-config.yml
View File

@ -1,6 +1,6 @@
bootstrap_containers: bootstrap_containers:
udev: udev:
image: rancher/os-udev image: rancher/os-udev:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -42,7 +42,7 @@ state:
dev: LABEL=RANCHER_STATE dev: LABEL=RANCHER_STATE
system_containers: system_containers:
acpid: acpid:
image: rancher/os-acpid image: rancher/os-acpid:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -58,7 +58,7 @@ system_containers:
- command-volumes - command-volumes
- system-volumes - system-volumes
all-volumes: all-volumes:
image: rancher/os-state image: rancher/os-state:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -78,7 +78,7 @@ system_containers:
- user-volumes - user-volumes
- system-volumes - system-volumes
cloud-init: cloud-init:
image: rancher/os-cloudinit image: rancher/os-cloudinit:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -99,7 +99,7 @@ system_containers:
- command-volumes - command-volumes
- system-volumes - system-volumes
cloud-init-pre: cloud-init-pre:
image: rancher/os-cloudinit image: rancher/os-cloudinit:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -119,7 +119,7 @@ system_containers:
- command-volumes - command-volumes
- system-volumes - system-volumes
command-volumes: command-volumes:
image: rancher/os-state image: rancher/os-state:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -148,7 +148,7 @@ system_containers:
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /usr/bin/docker:/usr/bin/docker:ro - /usr/bin/docker:/usr/bin/docker:ro
console: console:
image: rancher/os-console image: rancher/os-console:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -168,7 +168,7 @@ system_containers:
volumes_from: volumes_from:
- all-volumes - all-volumes
docker: docker:
image: rancher/os-docker image: rancher/os-docker:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -187,7 +187,7 @@ system_containers:
volumes_from: volumes_from:
- all-volumes - all-volumes
docker-volumes: docker-volumes:
image: rancher/os-state image: rancher/os-state:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -206,7 +206,7 @@ system_containers:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /var/lib/system-docker:/var/lib/system-docker - /var/lib/system-docker:/var/lib/system-docker
dockerwait: dockerwait:
image: rancher/os-dockerwait image: rancher/os-dockerwait:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -222,7 +222,7 @@ system_containers:
volumes_from: volumes_from:
- all-volumes - all-volumes
network: network:
image: rancher/os-network image: rancher/os-network:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -240,7 +240,7 @@ system_containers:
- command-volumes - command-volumes
- system-volumes - system-volumes
ntp: ntp:
image: rancher/os-ntp image: rancher/os-ntp:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -256,7 +256,7 @@ system_containers:
privileged: true privileged: true
restart: always restart: always
preload-system-images: preload-system-images:
image: rancher/os-preload image: rancher/os-preload:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -274,7 +274,7 @@ system_containers:
- command-volumes - command-volumes
- system-volumes - system-volumes
preload-user-images: preload-user-images:
image: rancher/os-preload image: rancher/os-preload:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -293,7 +293,7 @@ system_containers:
- command-volumes - command-volumes
- system-volumes - system-volumes
syslog: syslog:
image: rancher/os-syslog image: rancher/os-syslog:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -310,7 +310,7 @@ system_containers:
volumes_from: volumes_from:
- system-volumes - system-volumes
system-volumes: system-volumes:
image: rancher/os-state image: rancher/os-state:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -334,7 +334,7 @@ system_containers:
- /var/run:/var/run - /var/run:/var/run
- /var/log:/var/log - /var/log:/var/log
udev: udev:
image: rancher/os-udev image: rancher/os-udev:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []
@ -352,7 +352,7 @@ system_containers:
volumes_from: volumes_from:
- system-volumes - system-volumes
user-volumes: user-volumes:
image: rancher/os-state image: rancher/os-state:v0.3.2
command: [] command: []
dns: [] dns: []
dns_search: [] dns_search: []

3
scripts/build-images
View File

@ -41,7 +41,6 @@ chmod +x ${INITRD_DIR}/docker #ini
ln -sf bin/rancheros ./ros ln -sf bin/rancheros ./ros
for i in $(./ros c images -i os-config.yml); do for i in $(./ros c images -i os-config.yml); do
docker pull ${i}:${VERSION} docker pull ${i}
docker tag -f ${i}:${VERSION} ${i}
done done
docker save $(./ros c images -i os-config.yml) > ${INITRD_DIR}/images.tar #initrd2-images: /images.tar docker save $(./ros c images -i os-config.yml) > ${INITRD_DIR}/images.tar #initrd2-images: /images.tar

2
scripts/run
View File

@ -66,7 +66,7 @@ find | cpio -H newc -o > ${INITRD_TEST}
if [ ! -e ${HD} ]; then if [ ! -e ${HD} ]; then
mkdir -p $(dirname ${HD}) mkdir -p $(dirname ${HD})
gzcat ${HD_GZ} > ${HD} gzip -dc ${HD_GZ} > ${HD}
fi fi
mkdir -p $(dirname $USER_DATA) mkdir -p $(dirname $USER_DATA)