From 12e179dafd214362aa48fdf729310f9e7c6d577f Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 3 Oct 2017 00:54:23 +0200
Subject: [pkg] pin pyinstaller version

Also, allow to pass a different repo to the build-in-docker script.

- Resolves: #9089
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7ff10d1e..b3cba97d 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,10 @@ bundle_in_virtualenv:
 
 bundle_in_docker:
 	# needs a docker container called 'mybundle', created with 'make docker_container'
-	cat pkg/docker_build | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` mybundle bash
+	rm -rf $(DIST_VERSION) bitmaskbuild
+	cat pkg/docker_build | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" mybundle bash
+	cp -r bitmaskbuild/$(DIST_VERSION) dist/
+	rm -rf bitmaskbuild
 
 docker_container:
 	cd pkg/docker_bundle && docker build -t mybundle .
-- 
cgit v1.2.3