vis

commit 25db8aff69cf61a6d2ac3a88babbec4326f0b60d
parent 9e4da14106ebc4c377917c95398507f5b406d8ae
Author: Christian Hesse <mail@eworm.de>
Date:   Tue, 28 Jan 2020 14:29:01 +0100

build: allow to replace docker

This allows to build with docker-compatible container engine:

make DOCKER=podman docker

Diffstat:
M
Makefile
 | 
21
+++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ LDFLAGS_VIS = $(LDFLAGS_AUTO) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LDFLAGS_ACL
 
 STRIP?=strip
 TAR?=tar
+DOCKER?=docker
 
 all: $(ELF)
 
@@ -84,18 +85,18 @@ vis-single: vis-single.c vis-single-payload.inc
 	${STRIP} $@
 
 docker: clean
-	docker build -t vis .
-	docker run --rm -d --name vis vis tail -f /dev/null
-	docker exec vis apk update
-	docker exec vis apk upgrade
-	docker cp . vis:/build/vis
-	docker exec vis ./vis/configure CC='cc --static' --enable-acl
-	docker exec vis make -C vis VERSION="$(VERSION)" clean vis-single
-	docker cp vis:/build/vis/vis-single vis
-	docker kill vis
+	$(DOCKER) build -t vis .
+	$(DOCKER) run --rm -d --name vis vis tail -f /dev/null
+	$(DOCKER) exec vis apk update
+	$(DOCKER) exec vis apk upgrade
+	$(DOCKER) cp . vis:/build/vis
+	$(DOCKER) exec vis ./vis/configure CC='cc --static' --enable-acl
+	$(DOCKER) exec vis make -C vis VERSION="$(VERSION)" clean vis-single
+	$(DOCKER) cp vis:/build/vis/vis-single vis
+	$(DOCKER) kill vis
 
 docker-clean: clean
-	-docker image rm vis
+	-$(DOCKER) image rm vis
 
 debug: clean
 	@$(MAKE) CFLAGS_EXTRA='${CFLAGS_EXTRA} ${CFLAGS_DEBUG}'