summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-14 01:51:41 +0100
committerKali Kaneko <kali@leap.se>2018-02-15 16:36:53 +0100
commit48957fb436cf7238a494b9861ed5433169538d86 (patch)
tree9a87e8e8c38be60c27daff57e97f7b8104156fa3 /Makefile
parent6138fb6ef700e68b16d57313d3cb85c3326c3c7d (diff)
[pkg] add dockefile for riseupvpn
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ecf66560..0ba49edd 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ package_in_docker:
bundler_image:
cd pkg/docker_bundleapt && make bundler
-bundle_in_docker:
+bundle_in_docker_virtualenv:
# this runs bundles inside a virtualenv. it is kind of slow because it compiles all python extensions in dependencies each time.
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
@@ -101,13 +101,20 @@ bundle_in_docker:
cp -r bitmaskbuild/$(DIST_VERSION) dist/
rm -rf bitmaskbuild
-bundle_in_docker_apt:
+bundle_in_docker:
# needs a docker container called 'bitmask-bundler-apt', created with 'make bundler_image'
rm -rf $(DIST_VERSION) bitmaskbuild
# XXX why was it needed to specify -u `id -u` again? if it's something with gilab CI we might need
# to chown it first.
cat pkg/docker_build_apt | docker run -i -v /srv/bitmask-builds:/dist -w /dist -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-apt bash
+bundle_riseupvpn_in_docker:
+ # needs a docker container called 'bitmask-bundler-apt', created with 'make bundler_image'
+ rm -rf $(DIST_VERSION) bitmaskbuild
+ # XXX why was it needed to specify -u `id -u` again? if it's something with gilab CI we might need
+ # to chown it first.
+ cat pkg/docker_build_riseupvpn | docker run -i -v /srv/bitmask-builds:/dist -w /dist -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