From 48957fb436cf7238a494b9861ed5433169538d86 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 14 Feb 2018 01:51:41 +0100 Subject: [pkg] add dockefile for riseupvpn --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3