summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/docker_bundle/Dockerfile11
-rw-r--r--pkg/pyinst/build.mk3
2 files changed, 13 insertions, 1 deletions
diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile
index 686bc7d1..41635cb8 100644
--- a/pkg/docker_bundle/Dockerfile
+++ b/pkg/docker_bundle/Dockerfile
@@ -1,3 +1,11 @@
+# Thiis is *almost* a copy of the file that's used for building the bundle docker image.
+# The copy that the CI uses is in tests/docker/Dockerfile
+
+# It has diverged from the original, but it's because I don't want the clutter
+# of all the nodejs and friends inside a container for bundling.
+
+# TODO consider converging the two copies!
+
FROM ubuntu:16.04
MAINTAINER LEAP Encryption Access Project <info@leap.se>
@@ -7,5 +15,6 @@ 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
+ libsqlcipher-dev libssl-dev libffi-dev python-pyqt5 python-pyqt5.qtwebkit \
+ libusb-0.1-4 patchelf
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index 760f7983..25a7ef38 100644
--- a/pkg/pyinst/build.mk
+++ b/pkg/pyinst/build.mk
@@ -25,6 +25,9 @@ bundle_gpg:
# TODO build it in a docker container!
mkdir -p $(DIST_VERSION)/apps/mail
cp /usr/bin/gpg $(DIST_VERSION)/apps/mail/
+ # workaround for missing libreadline.so.6 in fresh ubuntu
+ patchelf --set-rpath '.' $(DIST_VERSION)/apps/mail/gpg
+ cp /lib/x86_64-linux-gnu/libusb-0.1.so.4 $(DIST_VERSION)/lib
bundle_linux_helpers:
mkdir -p $(DIST_VERSION)/apps/helpers