From 397fddc4e5fe2c670c81df637da3b7550ccb35e7 Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Mon, 23 Oct 2017 20:44:25 +0900
Subject: [PATCH] Put every suite in its own rootfs.  Re #3

This makes it easier to build suites in parallel from a local checkout
and/or keep the rootfs's of local builds around for investigation.
---
 .dockerignore | 3 +--
 .gitignore    | 3 +--
 bootstrap.sh  | 2 +-
 build.sh      | 4 ++--
 trim.sh       | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index c1f0fd4..836be3f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,3 @@
 *
 !./repository@devuan.org.asc
-!./rootfs.tar.gz
-!./rootfs-slim.tar.gz
+!./rootfs*.tar.gz
diff --git a/.gitignore b/.gitignore
index c98315a..eb8ed7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/rootfs
-/rootfs-slim
+/rootfs*
 /rootfs*.tar.gz
diff --git a/bootstrap.sh b/bootstrap.sh
index f011e89..fa3ced8 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,7 +11,7 @@ apt-get update
 apt-get install debootstrap -q -y
 
 suite=$1
-rootfs=$2
+rootfs=$2-$suite
 
 debootstrap \
     --force-check-gpg \
diff --git a/build.sh b/build.sh
index 3986d4e..66360fe 100755
--- a/build.sh
+++ b/build.sh
@@ -22,7 +22,7 @@ STAMP=$(date +%F)
 
 cat > Dockerfile <<EOF
 FROM scratch
-ADD $ROOTFS.tar.gz /
+ADD $ROOTFS-$SUITE.tar.gz /
 CMD ["bash"]
 EOF
 
@@ -47,7 +47,7 @@ STAMP=$(date +%F)
 
 cat > Dockerfile <<EOF
 FROM scratch
-ADD $ROOTFS-slim.tar.gz /
+ADD $ROOTFS-$SUITE-slim.tar.gz /
 CMD ["bash"]
 EOF
 
diff --git a/trim.sh b/trim.sh
index 30b5980..1bec4a7 100755
--- a/trim.sh
+++ b/trim.sh
@@ -8,7 +8,7 @@ DEBIAN_FRONTEND=noninteractive
 export DEBIAN_FRONTEND
 
 suite=$1
-rootfs=$2
+rootfs=$2-$suite
 cp -al $rootfs $rootfs-slim
 rootfs=$rootfs-slim