diff --git a/os-config.yml b/os-config.yml index 7ad94179..912b31bb 100644 --- a/os-config.yml +++ b/os-config.yml @@ -1,6 +1,6 @@ bootstrap_containers: udev: - image: rancher/os-udev + image: rancher/os-udev:v0.3.2 command: [] dns: [] dns_search: [] @@ -42,7 +42,7 @@ state: dev: LABEL=RANCHER_STATE system_containers: acpid: - image: rancher/os-acpid + image: rancher/os-acpid:v0.3.2 command: [] dns: [] dns_search: [] @@ -58,7 +58,7 @@ system_containers: - command-volumes - system-volumes all-volumes: - image: rancher/os-state + image: rancher/os-state:v0.3.2 command: [] dns: [] dns_search: [] @@ -78,7 +78,7 @@ system_containers: - user-volumes - system-volumes cloud-init: - image: rancher/os-cloudinit + image: rancher/os-cloudinit:v0.3.2 command: [] dns: [] dns_search: [] @@ -99,7 +99,7 @@ system_containers: - command-volumes - system-volumes cloud-init-pre: - image: rancher/os-cloudinit + image: rancher/os-cloudinit:v0.3.2 command: [] dns: [] dns_search: [] @@ -119,7 +119,7 @@ system_containers: - command-volumes - system-volumes command-volumes: - image: rancher/os-state + image: rancher/os-state:v0.3.2 command: [] dns: [] dns_search: [] @@ -148,7 +148,7 @@ system_containers: - /lib/modules:/lib/modules - /usr/bin/docker:/usr/bin/docker:ro console: - image: rancher/os-console + image: rancher/os-console:v0.3.2 command: [] dns: [] dns_search: [] @@ -168,7 +168,7 @@ system_containers: volumes_from: - all-volumes docker: - image: rancher/os-docker + image: rancher/os-docker:v0.3.2 command: [] dns: [] dns_search: [] @@ -187,7 +187,7 @@ system_containers: volumes_from: - all-volumes docker-volumes: - image: rancher/os-state + image: rancher/os-state:v0.3.2 command: [] dns: [] dns_search: [] @@ -206,7 +206,7 @@ system_containers: - /var/lib/docker:/var/lib/docker - /var/lib/system-docker:/var/lib/system-docker dockerwait: - image: rancher/os-dockerwait + image: rancher/os-dockerwait:v0.3.2 command: [] dns: [] dns_search: [] @@ -222,7 +222,7 @@ system_containers: volumes_from: - all-volumes network: - image: rancher/os-network + image: rancher/os-network:v0.3.2 command: [] dns: [] dns_search: [] @@ -240,7 +240,7 @@ system_containers: - command-volumes - system-volumes ntp: - image: rancher/os-ntp + image: rancher/os-ntp:v0.3.2 command: [] dns: [] dns_search: [] @@ -256,7 +256,7 @@ system_containers: privileged: true restart: always preload-system-images: - image: rancher/os-preload + image: rancher/os-preload:v0.3.2 command: [] dns: [] dns_search: [] @@ -274,7 +274,7 @@ system_containers: - command-volumes - system-volumes preload-user-images: - image: rancher/os-preload + image: rancher/os-preload:v0.3.2 command: [] dns: [] dns_search: [] @@ -293,7 +293,7 @@ system_containers: - command-volumes - system-volumes syslog: - image: rancher/os-syslog + image: rancher/os-syslog:v0.3.2 command: [] dns: [] dns_search: [] @@ -310,7 +310,7 @@ system_containers: volumes_from: - system-volumes system-volumes: - image: rancher/os-state + image: rancher/os-state:v0.3.2 command: [] dns: [] dns_search: [] @@ -334,7 +334,7 @@ system_containers: - /var/run:/var/run - /var/log:/var/log udev: - image: rancher/os-udev + image: rancher/os-udev:v0.3.2 command: [] dns: [] dns_search: [] @@ -352,7 +352,7 @@ system_containers: volumes_from: - system-volumes user-volumes: - image: rancher/os-state + image: rancher/os-state:v0.3.2 command: [] dns: [] dns_search: [] diff --git a/scripts/build-images b/scripts/build-images index ca419177..8c1ca52e 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -41,7 +41,6 @@ chmod +x ${INITRD_DIR}/docker #ini ln -sf bin/rancheros ./ros for i in $(./ros c images -i os-config.yml); do - docker pull ${i}:${VERSION} - docker tag -f ${i}:${VERSION} ${i} + docker pull ${i} done docker save $(./ros c images -i os-config.yml) > ${INITRD_DIR}/images.tar #initrd2-images: /images.tar diff --git a/scripts/run b/scripts/run index 6a9afa46..b056700b 100755 --- a/scripts/run +++ b/scripts/run @@ -66,7 +66,7 @@ find | cpio -H newc -o > ${INITRD_TEST} if [ ! -e ${HD} ]; then mkdir -p $(dirname ${HD}) - gzcat ${HD_GZ} > ${HD} + gzip -dc ${HD_GZ} > ${HD} fi mkdir -p $(dirname $USER_DATA)