From b4cfe16406aa784358ffa67c95097bec7c31c217 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 19 Feb 2019 06:40:07 +0000
Subject: Dockerfile needs to clean up after Builder, apparently.

---
 Dockerfile | 10 +++++++++-
 Makefile   |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 75769cf..284d3f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,10 @@
 FROM cryptech-builder:base
 
-RUN echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
+# Should conditionalize the "jessie-backports" stuff on --build-env=DEBIAN_RELEASE
+# from Makefile.  Later.
+
+RUN echo 'deb http://deb.debian.org/debian jessie-backports main' \
+	 > /etc/apt/sources.list.d/backports.list
 
 # Stuff we need we need to build firmware and client packages.  This
 # stuff is much more likely to change than the XiLinx tools, so we put
@@ -22,3 +26,7 @@ RUN apt-get update && \
 	    pbuilder && \
     apt-get -t jessie-backports install -y \
 	    debootstrap distro-info-data
+
+USER	builder
+WORKDIR /home/builder
+CMD	/bin/bash
diff --git a/Makefile b/Makefile
index 69c66ae..e93d30f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+DEBIAN_RELEASE	:= jessie
+
 XILINX_TARBALL	:= Xilinx_ISE_DS_Lin_14.7_1015_1.tar
 XILINX_LICENSE	:= Xilinx.lic
 XILINX_PKGDIR	:= fs/$(basename ${XILINX_TARBALL})
@@ -20,7 +22,7 @@ ifeq (,${BASE_IMAGE_EXISTS})
 ifeq (,${BOOT_IMAGE_EXISTS})
 	rm -rf fs
 	mkdir fs
-	sudo /usr/sbin/debootstrap --foreign jessie fs
+	sudo /usr/sbin/debootstrap --foreign ${DEBIAN_RELEASE} fs
 	sudo tar -C fs -c . | docker import - ${BOOT_IMAGE}
 endif
 	sudo rm -rf fs
-- 
cgit v1.2.3