1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00

do not pull os-images by default if they exist

also, cleanup os-initrdbase container on exit in ./scripts/copy-images
(as trap can apparently only run one command)
This commit is contained in:
Ivan Mikushin
2015-07-28 13:10:09 +05:00
parent e812e7960a
commit 55ca88ed82
2 changed files with 4 additions and 2 deletions

View File

@@ -20,6 +20,7 @@ docker cp ${CONTAINER_INITRDBASE}:/initrd ${BUILD} # copies files to ${BUILD}/in
CONTAINER_KERNEL=$(docker create rancher/os-kernel:${VERSION})
cleanup_kernel() {
cleanup_initrdbase
docker rm -v ${CONTAINER_KERNEL}
}
trap cleanup_kernel EXIT