From f072cff37c524180694a83890a2a4f75d5e9e9c7 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Thu, 6 Aug 2015 15:03:29 +0500 Subject: [PATCH] cleanup after docker create --- scripts/mk-initrd.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/mk-initrd.sh b/scripts/mk-initrd.sh index e85b3191..3ba4b64f 100755 --- a/scripts/mk-initrd.sh +++ b/scripts/mk-initrd.sh @@ -15,12 +15,14 @@ cp bin/rancheros ${INITRD_DIR}/usr/bin/ros ln -s usr/bin/ros ${INITRD_DIR}/init ln -s bin ${INITRD_DIR}/usr/sbin -docker export $(docker create rancher/docker:1.8.0-rc2) | tar xvf - -C ${INITRD_DIR} --exclude=usr/bin/dockerlaunch \ - --exclude=usr/bin/docker \ - --exclude=usr/share/git-core \ - --exclude=usr/bin/git \ - --exclude=usr/bin/ssh \ - --exclude=usr/libexec/git-core \ - usr +DFS=$(docker create rancher/docker:1.8.0-rc2) +trap "docker rm -fv ${DFS}" EXIT +docker export ${DFS} | tar xvf - -C ${INITRD_DIR} --exclude=usr/bin/dockerlaunch \ + --exclude=usr/bin/docker \ + --exclude=usr/share/git-core \ + --exclude=usr/bin/git \ + --exclude=usr/bin/ssh \ + --exclude=usr/libexec/git-core \ + usr cd ${INITRD_DIR} && find | cpio -H newc -o | lzma -c > ${DIST}/artifacts/initrd