From 7e86aa78721aa0a5a291bcf08fab2fb311cb8026 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Thu, 29 Dec 2016 23:20:13 +0100 Subject: [pkg] add docker files to build bundle --- Makefile | 8 ++++++++ pkg/docker_build | 6 ++++++ pkg/docker_bundle/Dockerfile | 11 +++++++++++ 3 files changed, 25 insertions(+) create mode 100644 pkg/docker_build create mode 100644 pkg/docker_bundle/Dockerfile diff --git a/Makefile b/Makefile index 462caec5..00552257 100644 --- a/Makefile +++ b/Makefile @@ -37,3 +37,11 @@ qt-resources: doc: cd docs && make html + +docker_container: + cd pkg/docker_bundle && docker build -t mybundle + +bundle_in_docker: + # needs a docker container called 'mybundle', created with 'make docker_container' + cat pkg/docker_build | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` mybundle bash + mkdir -p dist && cp -r bitmaskbuild/dist/* dist diff --git a/pkg/docker_build b/pkg/docker_build new file mode 100644 index 00000000..4d782667 --- /dev/null +++ b/pkg/docker_build @@ -0,0 +1,6 @@ +git clone https://github.com/leapcode/bitmask-dev bitmaskbuild +cd bitmaskbuild +pkg/build_bundle_with_venv.sh + +cp -r bitmaskbuild/dist/ dist/ +rm -rf bitmaskbuild diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile new file mode 100644 index 00000000..686bc7d1 --- /dev/null +++ b/pkg/docker_bundle/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:16.04 + +MAINTAINER LEAP Encryption Access Project +LABEL Description="Image for building Bitmask bundle based on Ubuntu 16:04" Vendor="LEAP" Version="1.0" + +RUN apt update && apt upgrade -y + +# Install bitmask-dev build deps +RUN apt install -y git build-essential python-virtualenv libpython-dev \ + libsqlcipher-dev libssl-dev libffi-dev python-pyqt5 python-pyqt5.qtwebkit + -- cgit v1.2.3