diff options
| author | Kali Kaneko <kali@leap.se> | 2018-02-12 20:12:33 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-02-15 16:36:44 +0100 |
| commit | c0ee680866c6ccf60a0318e120de3f42cbb4992a (patch) | |
| tree | dc597743b49e257b6bf1a9f0ccd749eaa5b084ad | |
| parent | 91f2b6d8e06de864cd6f43d06b5581ec101f94ff (diff) | |
[pkg] add target for docker_apt bundler
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | pkg/docker_build_apt | 13 |
2 files changed, 22 insertions, 2 deletions
@@ -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 diff --git a/pkg/docker_build_apt b/pkg/docker_build_apt new file mode 100644 index 00000000..53dc9fe7 --- /dev/null +++ b/pkg/docker_build_apt @@ -0,0 +1,13 @@ +# 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"} + +RELEASE=bitmask-`cat pkg/next-version` +echo "[+] CLONING REPO from $REPO [$BRANCH]" +git clone $REPO bitmaskbuild +cd bitmaskbuild +git checkout $BRANCH +mkdir -p dist/ +VIRTUAL_ENV=/usr/local make bundle |