summaryrefslogtreecommitdiff
path: root/pkg/docker_bundleapt
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-14 02:38:47 +0100
committerKali Kaneko <kali@leap.se>2018-02-15 16:36:58 +0100
commit5abd127f3780ca2078962ace489bd4c32b5d545d (patch)
tree4e3f81c695fe848906c89b4fd34c20a4e9c39e02 /pkg/docker_bundleapt
parent76878da40906af750aed62d63bd1e928bfa45163 (diff)
[pkg] packaging fixes for anonvpn bundle
Diffstat (limited to 'pkg/docker_bundleapt')
-rw-r--r--pkg/docker_bundleapt/Dockerfile8
-rw-r--r--pkg/docker_bundleapt/Makefile6
-rw-r--r--pkg/docker_bundleapt/systray.sh10
3 files changed, 20 insertions, 4 deletions
diff --git a/pkg/docker_bundleapt/Dockerfile b/pkg/docker_bundleapt/Dockerfile
index 0e79cf3c..810cae81 100644
--- a/pkg/docker_bundleapt/Dockerfile
+++ b/pkg/docker_bundleapt/Dockerfile
@@ -18,7 +18,8 @@ RUN apt install -y --no-install-recommends \
qttranslations5-l10n libgl1-mesa-glx \
libusb-0.1-4 patchelf wget \
gnupg1 git libgl1-mesa-glx \
- libappindicator3-dev libgtk-3-dev golang
+ libappindicator3-dev libgtk-3-dev golang \
+ libsodium-dev
# Pyinstaller custom versions
#ARG PYINSTALLER_TAG=v3.2
@@ -73,4 +74,7 @@ RUN ln -s /usr/lib/python2.7/dist-packages/sipconfig_nd.py /usr/local/lib/python
RUN ln -s /usr/lib/python2.7/dist-packages/sip.pyi /usr/local/lib/python2.7/site-packages/
# get dependencies for bitmask-systray so that builds are quick
-RUN export GOPATH=/srv/go && go get 0xacab.org/leap/bitmask-systray
+RUN export GOPATH=/srv/go && \
+ export CGO_CPPFLAGS="-I/usr/include" && \
+ export CGO_LDFLAGS="-L/usr/lib -L/usr/lib/z86_64-linux-gnu -lzmq -lpthread -lsodium -lrt -lstdc++ -lm -lc -lgcc" && \
+ go get 0xacab.org/leap/bitmask-systray
diff --git a/pkg/docker_bundleapt/Makefile b/pkg/docker_bundleapt/Makefile
index e68a9cf5..f36d2ef1 100644
--- a/pkg/docker_bundleapt/Makefile
+++ b/pkg/docker_bundleapt/Makefile
@@ -10,11 +10,13 @@ login:
docker login 0xacab.org:4567
# for local tests
-
+prune:
+ docker system prune
bundler:
docker build -t $(IMAGE) .
shell:
docker run -i -t $(IMAGE) bash
bundle:
echo "cd /src/leap/bitmask-dev && VIRTUAL_ENV=/usr/local make bundle && cp -r dist/* /dist" | docker run -i -v /srv/bitmask-builds:/dist -w /dist $(IMAGE) bash
-
+systray:
+ cat systray.sh | docker run -i -v /srv/bitmask-builds:/dist -w /dist $(IMAGE) bash
diff --git a/pkg/docker_bundleapt/systray.sh b/pkg/docker_bundleapt/systray.sh
new file mode 100644
index 00000000..4bb19067
--- /dev/null
+++ b/pkg/docker_bundleapt/systray.sh
@@ -0,0 +1,10 @@
+export GOPATH=/srv/go
+export CGO_CPPFLAGS="-I/usr/include"
+export CGO_LDFLAGS="-L/usr/lib -L/usr/lib/z86_64-linux-gnu -lzmq -lpthread -lsodium -lrt -lstdc++ -lm -lc -lgcc"
+
+echo "[+] building systray deps"
+go get -a 0xacab.org/leap/bitmask-systray
+cd /src/leap && git clone --depth 1 --single-branch --branch master https://0xacab.org/leap/bitmask-systray
+echo "[+] building systray"
+cd bitmask-systray && go build .
+cp -r /src/leap/bitmask-systray/bitmask-systray /dist