summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-12 20:12:33 +0100
committerKali Kaneko <kali@leap.se>2018-02-15 16:36:44 +0100
commitc0ee680866c6ccf60a0318e120de3f42cbb4992a (patch)
treedc597743b49e257b6bf1a9f0ccd749eaa5b084ad /Makefile
parent91f2b6d8e06de864cd6f43d06b5581ec101f94ff (diff)
[pkg] add target for docker_apt bundler
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e57489bf..a6ed2a56 100644
--- a/Makefile
+++ b/Makefile
@@ -91,16 +91,23 @@ package_in_docker:
gitlab-runner exec docker package:amd64_stretch
bundler_image:
- cd pkg/docker_bundle && docker build -t local_bundler .
+ cd pkg/docker_bundleapt && make bundler
bundle_in_docker:
- # needs a docker container called 'local_bundler', created with 'make bundler_image'
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)" local_bundler bash
mkdir -p dist/
cp -r bitmaskbuild/$(DIST_VERSION) dist/
rm -rf bitmaskbuild
+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
+
upload:
python setup.py sdist bdist_wheel --universal upload --sign -i kali@leap.se -r pypi