summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-10-03 00:54:23 +0200
committerKali Kaneko <kali@leap.se>2017-10-03 02:50:15 +0200
commit12e179dafd214362aa48fdf729310f9e7c6d577f (patch)
treee56e33e83edf7a1e0923ffc8e281027e2464f932 /Makefile
parent93c5426f7979ab20202ec5cc0c81c805103a4439 (diff)
[pkg] pin pyinstaller version
Also, allow to pass a different repo to the build-in-docker script. - Resolves: #9089
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7ff10d1..b3cba97 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 .