diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | pkg/docker_build_riseupvpn | 30 |
2 files changed, 39 insertions, 2 deletions
@@ -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 diff --git a/pkg/docker_build_riseupvpn b/pkg/docker_build_riseupvpn new file mode 100644 index 00000000..4cffcb49 --- /dev/null +++ b/pkg/docker_build_riseupvpn @@ -0,0 +1,30 @@ +# This script gets executed inside the docker-bundler-apt image. +# (no virtualenv, so all the dependencies must be already installed in the image). + +: ${REPO:="https://github.com/leapcode/bitmask-dev"} +: ${BRANCH:="master"} + +# build bitmask-systray + +export GOPATH=/srv/go +go get 0xacab.org/leap/bitmask-systray +cd /src/leap && git clone https://0xacab.org/leap/bitmask-systray +cd bitmask-systray && go build . + + +cd /src/leap/bitmask-dev +RELEASE=bitmask-`cat pkg/next-version` +cd $HOME +echo "[+] CLONING REPO from $REPO [$BRANCH]" +git clone $REPO bitmaskbuild +cd bitmaskbuild +git checkout $BRANCH +git fetch --tags +mkdir -p dist/ + +# nuke mail +rm -rf src/leap/bitmask/mail +cp /src/leap/bitmask-systray/bitmask-systray dist/${RELEASE}/lib/ +VIRTUAL_ENV=/usr/local make bundle_linux +cp -r dist/* /dist + |