From e6fce11310541119a82a57b20cb326712445c455 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Wed, 4 Sep 2019 16:30:35 +0000
Subject: Add "base:" target.

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

diff --git a/Dockerfile b/Dockerfile
index 7b6aed8..25517dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
 # Given that this is security software, you might want to consider
 # generating your own debian:stretch base image using debbootstrap
-# rather than trusting Dockerhub
+# rather than trusting Dockerhub, see "base" target in the Makefile.
 
-FROM debian:stretch
+ARG  DIST=debian
+ARG  CODE=stretch
+FROM $DIST:$CODE
 
 # Prerequisites.  Current version of python-django is a bit too recent
 # for the rpki-ca GUI, but rpki-rp only uses the ORM, which hasn't
diff --git a/Makefile b/Makefile
index 3681b00..9dcc077 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,16 @@
+DIST := debian
+CODE := stretch
+
 all:
 	apt-get download rpki-rp
-	docker build -t rpki-rp .
+	docker build --tag rpki-rp --build-arg 'DIST=${DIST}' --build-arg 'CODE=${CODE}' .
 
 clean:
 	git clean -dfx
 
-.PHONY: all clean
+base:
+	sudo debootstrap ${CODE} ${CODE}
+	sudo tar -C ${CODE} -c . | docker import - ${DIST}:${CODE}
+	sudo rm -rf ${CODE}
+
+.PHONY: all clean base
-- 
cgit v1.2.3