summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2019-12-13 14:52:21 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2019-12-13 14:52:21 +0100
commit718d5f7488d87dd60b172c0f19aaedfb5b2b3b64 (patch)
tree19ccc8ce086c9683ee0bd1cf5f036f6e7b9e5d04 /docker
parent2f49515a8a46dc82687d1fff4de615f29a4be6e4 (diff)
[ci] grab newest nsis version, backup copy of nssm
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile12
1 files changed, 11 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ec80d00..96b6630 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,8 @@
# An image to build and package the Bitmask Lite (RiseupVPN and other branded builds)
# (c) LEAP Encryption Access Project 2018-2019
+
+# we start with 18.04 (bionic) to match the core18 used in the snap
+# but we will have to install a couple of extras on top...
FROM ubuntu:18.04
MAINTAINER LEAP Encryption Access Project <info@leap.se>
@@ -15,7 +18,7 @@ RUN apt-get update && apt-get upgrade -y && \
libappindicator3-dev libgtk-3-dev \
mingw-w64 upx-ucl python snapcraft \
unzip \
- devscripts fakeroot debhelper nsis \
+ devscripts fakeroot debhelper \
clang llvm-dev libxml2-dev uuid-dev \
libssl-dev bash patch tar \
xz-utils bzip2 gzip sed cpio libbz2-dev && \
@@ -25,9 +28,16 @@ RUN apt-get update && apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
dh-golang golang golang-golang-x-text-dev
+# version in 18.04 (bionic) is too old
RUN wget http://archive.ubuntu.com/ubuntu/pool/universe/g/golang-x-text/golang-golang-x-text-dev_0.3.2-1_all.deb && \
dpkg -i golang-golang-x-text-dev_0.3.2-1_all.deb
+# we also need a newer nsis version
+RUN echo "deb http://de.archive.ubuntu.com/ubuntu disco main universe" >> /etc/apt/sources.list && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends nsis && \
+ sed -i '$ d' /etc/apt/sources.list && apt-get update
+
# osx cross compiling
RUN git clone https://github.com/tpoechtrager/osxcross && \
cd osxcross/tarballs && \