From ac4c01b614e00f6ff26606a243494c245517cec1 Mon Sep 17 00:00:00 2001
From: Richard Mortier <mort@cantab.net>
Date: Tue, 26 Mar 2019 15:41:00 +0000
Subject: make: parameterise base image (`IMG`)

Signed-off-by: Richard Mortier <mort@cantab.net>
---
 Makefile  | 2 +-
 abuild.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e73fa34..266ab16 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ TAGS = 2.6 2.7 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 edge
 
 .PHONY: build
 build: $(patsubst %, build-%, $(TAGS))
-	sed 's!%%ALPINE_VOLUMES%%!$(VOLS)!' abuild.in >| abuild
+	sed 's!%%ABUILD_VOLUMES%%!$(VOLS)!;s!%%ABUILD_IMAGE%%!$(IMG)!' abuild.in >| abuild
 	chmod +x abuild
 
 .PHONY: build-%
diff --git a/abuild.in b/abuild.in
index e8cea08..0b3f77e 100755
--- a/abuild.in
+++ b/abuild.in
@@ -38,7 +38,7 @@ ABUILD_VOLUMES="
     -v ${PWD%/aports*}/aports:/home/builder/aports
 "
 if [ "$DOCKER_ABUILD_CACHE" = "true" ]; then
-  for v in %%ALPINE_VOLUMES%% ; do
+  for v in %%ABUILD_VOLUMES%% ; do
     vol=abuild-$ABUILD_VERSION-${v//\//_}
     if [ "$DOCKER_ABUILD_CLEAN" = "true" ]; then
       docker rm -f $(docker ps -qaf "volume=$vol") >/dev/null 2>/dev/null || true
@@ -52,4 +52,4 @@ fi
 ## go!
 ABUILD_WORKDIR=/home/builder/aports${PWD#*/aports}
 DOCKER="docker run -ti $ABUILD_VOLUMES -e DOCKER_ABUILD_DEBUG $DOCKER_ABUILD_ARGS"
-$DOCKER --workdir $ABUILD_WORKDIR mor1/abuild:$ABUILD_VERSION "$@"
+$DOCKER --workdir $ABUILD_WORKDIR %%ABUILD_IMAGE%%:$ABUILD_VERSION "$@"
-- 
cgit v1.2.3