summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-12-29 23:20:13 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2016-12-29 23:20:13 +0100
commit7e86aa78721aa0a5a291bcf08fab2fb311cb8026 (patch)
treeac971375d8fd94eae39aa499bda6ffb1db1aaa97
parentc4b48f066876842a7321b211f369dce4ef305b08 (diff)
[pkg] add docker files to build bundle
-rw-r--r--Makefile8
-rw-r--r--pkg/docker_build6
-rw-r--r--pkg/docker_bundle/Dockerfile11
3 files changed, 25 insertions, 0 deletions
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 <info@leap.se>
+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
+