From 2bb9aab2084b69a5b6c7cdae020f663a50414822 Mon Sep 17 00:00:00 2001 From: gdm85 Date: Wed, 11 Jun 2014 14:48:00 +0200 Subject: [PATCH] * fixed gitian patch (line was truncated) * sleep after docker commit --- docker/gitian-host/gitian.patch | 4 ++-- docker/scripts/create-gitian-host.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/gitian-host/gitian.patch b/docker/gitian-host/gitian.patch index 07a05b0..bca56ba 100644 --- a/docker/gitian-host/gitian.patch +++ b/docker/gitian-host/gitian.patch @@ -1,5 +1,5 @@ diff --git a/bin/make-base-vm b/bin/make-base-vm -index c1920f3..db311dd 100755 +index c1920f3..a5935fb 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -106,19 +106,6 @@ fi @@ -7,7 +7,7 @@ index c1920f3..db311dd 100755 libexec/config-bootstrap-fixup rm -rf $OUT -sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup -+env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-m ++env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup mv $OUT/*.qcow2 $OUT.qcow2 rm -rf $OUT - diff --git a/docker/scripts/create-gitian-host.sh b/docker/scripts/create-gitian-host.sh index 2c9deda..c4d377e 100755 --- a/docker/scripts/create-gitian-host.sh +++ b/docker/scripts/create-gitian-host.sh @@ -39,8 +39,8 @@ wait_for_ssh $IP 10 && \ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no debian@$IP ./build-base-vms.sh && \ docker kill $CID && \ docker wait $CID && \ -sleep 3 && \ docker commit $CID gdm85/gitian-host-vms && \ +sleep 3 && \ docker rm $CID && \ echo "Gitian host images created successfully!" && \ echo "You can now spawn containers with spawn-gitian-host.sh"