From 6f571a8f39ba975d263203d3def9bad05d92260e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 28 Jan 2020 14:03:50 +0100
Subject: build: clean up docker build

---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 08504ad..b42eed9 100644
--- a/Makefile
+++ b/Makefile
@@ -88,11 +88,10 @@ docker: clean
 	docker run --rm -d --name vis vis tail -f /dev/null
 	docker exec vis apk update
 	docker exec vis apk upgrade
-	docker cp . vis:/tmp/vis
-	docker exec vis sed -i '/^VERSION/c VERSION = $(VERSION)' Makefile
-	docker exec vis ./configure CC='cc --static' --enable-acl
-	docker exec vis make clean vis-single
-	docker cp vis:/tmp/vis/vis-single vis
+	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
 
 debug: clean
-- 
cgit v1.2.3