summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/bundles/build.mk4
-rw-r--r--pkg/docker_bundle/Dockerfile3
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk
index 6d79103f..aa9a2a34 100644
--- a/pkg/bundles/build.mk
+++ b/pkg/bundles/build.mk
@@ -32,8 +32,8 @@ bundle: bundle_clean
bundle_linux_gpg:
# TODO build it in a docker container!
mkdir -p $(DIST_VERSION)/apps/mail
- # this is /usr/bin/gpg1 in debian stretch
- cp /usr/bin/gpg $(DIST_VERSION)/apps/mail/gpg
+ # this is /usr/bin/gpg1 in debian stretch, gpg in ubuntu
+ cp /usr/bin/gpg1 $(DIST_VERSION)/apps/mail/gpg
# 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
diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile
index 91515460..c27a0e6f 100644
--- a/pkg/docker_bundle/Dockerfile
+++ b/pkg/docker_bundle/Dockerfile
@@ -4,7 +4,8 @@
# 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 -- kali.
-FROM ubuntu:17.10
+# Building on ubuntu 17.10 gives glibc version compat errors.
+FROM debian:stretch
MAINTAINER LEAP Encryption Access Project <info@leap.se>
LABEL Description="Image for building Bitmask bundle based on Ubuntu 17:04" Vendor="LEAP" Version="1.1"