Put root file system value in a variable

It is passed to bootstrap.sh to allow for defining it in a *single*
location.
This commit is contained in:
Olaf Meeuwissen 2017-08-26 20:58:10 +09:00
parent 852c04930d
commit 813cb4e823
2 changed files with 4 additions and 3 deletions

View File

@ -10,8 +10,8 @@ export DEBIAN_FRONTEND
apt-get update apt-get update
apt-get install debootstrap -q -y apt-get install debootstrap -q -y
rootfs=$PWD/rootfs
suite=$1 suite=$1
rootfs=$2
debootstrap \ debootstrap \
--force-check-gpg \ --force-check-gpg \

View File

@ -6,15 +6,16 @@
MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated MIGRATED_IMAGE=$CI_REGISTRY_IMAGE/debian-$DEBIAN_VERSION/migrated
SUITE=$1 SUITE=$1
ROOTFS=rootfs
rm -rf rootfs || true rm -rf $ROOTFS || true
docker pull $MIGRATED_IMAGE docker pull $MIGRATED_IMAGE
docker run --rm \ docker run --rm \
--cap-add SYS_ADMIN \ --cap-add SYS_ADMIN \
--volume $PWD:/devuan \ --volume $PWD:/devuan \
--workdir /devuan \ --workdir /devuan \
$MIGRATED_IMAGE ./bootstrap.sh $SUITE $MIGRATED_IMAGE ./bootstrap.sh $SUITE $ROOTFS
IMAGE=$CI_REGISTRY_IMAGE IMAGE=$CI_REGISTRY_IMAGE
STAMP=$(date +%F) STAMP=$(date +%F)