diff --git a/bootstrap.sh b/bootstrap.sh index b96ebd4..198f802 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -10,8 +10,8 @@ export DEBIAN_FRONTEND apt-get update apt-get install debootstrap -q -y -rootfs=$PWD/rootfs suite=$1 +rootfs=$2 debootstrap \ --force-check-gpg \ diff --git a/build.sh b/build.sh index 1691511..be18972 100755 --- a/build.sh +++ b/build.sh @@ -6,15 +6,16 @@ MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated SUITE=$1 +ROOTFS=rootfs -rm -rf rootfs || true +rm -rf $ROOTFS || true docker pull $MIGRATED_IMAGE docker run --rm \ --cap-add SYS_ADMIN \ --volume $PWD:/devuan \ --workdir /devuan \ - $MIGRATED_IMAGE ./bootstrap.sh $SUITE + $MIGRATED_IMAGE ./bootstrap.sh $SUITE $ROOTFS IMAGE=$CI_REGISTRY_IMAGE STAMP=$(date +%F)