summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile20
1 files changed, 4 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5934ea8..82ea94e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,13 +3,14 @@
# 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 as builder
+FROM ubuntu:20.04 as builder
MAINTAINER LEAP Encryption Access Project <info@leap.se>
LABEL Description="An image to build Bitmask Lite" Vendor="LEAP" Version="1.2"
ENV OSXSDK_SHA256="631b4144c6bf75bf7a4d480d685a9b5bda10ee8d03dbf0db829391e2ef858789" \
PATH="$PATH:/osxcross/target/bin:/usr/lib/go-1.14/bin"
+ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get upgrade --yes && \
apt-get install --yes --no-install-recommends \
build-essential \
@@ -26,21 +27,8 @@ RUN apt-get update && apt-get upgrade --yes && \
software-properties-common dh-golang \
jq \
squashfs-tools \
- qtbase5-dev qttools5-dev-tools qt5-qmake g++ qtdeclarative5-dev qt5-default && \
- add-apt-repository -y ppa:longsleep/golang-backports && \
- apt-get update && \
- apt-get install -y --no-install-recommends golang-1.14-go golang-go golang-golang-x-tools-dev && \
- rm -r /var/lib/apt/lists/*
-
-# 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 eoan 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 && \
+ qtbase5-dev qttools5-dev-tools qt5-qmake g++ qtdeclarative5-dev qt5-default \
+ golang-1.14-go golang-go golang-golang-x-tools-dev && \
rm -r /var/lib/apt/lists/*
# osx cross compiling