summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-12 20:44:39 +0100
committerKali Kaneko <kali@leap.se>2018-02-15 16:36:45 +0100
commit8b09b86e4543c9531cc2f3ef6d1695b0c703b636 (patch)
treebedf65dc09815058a21d4a4a0b1235560de68921
parentc0ee680866c6ccf60a0318e120de3f42cbb4992a (diff)
[pkg] fix docker build
-rw-r--r--Makefile5
-rw-r--r--pkg/docker_build_apt3
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