From 8b09b86e4543c9531cc2f3ef6d1695b0c703b636 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 12 Feb 2018 20:44:39 +0100
Subject: [pkg] fix docker build

---
 Makefile             | 5 +----
 pkg/docker_build_apt | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a6ed2a56..460e0a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -103,10 +103,7 @@ bundle_in_docker:
 bundle_in_docker_apt:
 	# needs a docker container called 'bitmask-bundler-apt', created with 'make bundler_image'
 	rm -rf $(DIST_VERSION) bitmaskbuild
-	cat pkg/docker_build_apt | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-apt bash
-	mkdir -p dist/
-	cp -r bitmaskbuild/$(DIST_VERSION) dist/
-	rm -rf bitmaskbuild
+	cat pkg/docker_build_apt | docker run -i -v /srv/bitmask-builds:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-apt bash
 
 upload:
 	python setup.py sdist bdist_wheel --universal upload --sign -i kali@leap.se -r pypi
diff --git a/pkg/docker_build_apt b/pkg/docker_build_apt
index 53dc9fe7..6378990f 100644
--- a/pkg/docker_build_apt
+++ b/pkg/docker_build_apt
@@ -4,10 +4,13 @@
 : ${REPO:="https://github.com/leapcode/bitmask-dev"}
 : ${BRANCH:="master"}
 
+cd /src/leap/bitmask-dev
 RELEASE=bitmask-`cat pkg/next-version`
+cd /src/leap/
 echo "[+] CLONING REPO from $REPO [$BRANCH]"
 git clone $REPO bitmaskbuild
 cd bitmaskbuild
 git checkout $BRANCH
 mkdir -p dist/
 VIRTUAL_ENV=/usr/local make bundle
+cp -r dist/* /dist
-- 
cgit v1.2.3