diff options
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e9d3bc1..b0645e4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,25 +8,27 @@ FROM ubuntu:18.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.12/bin" + PATH="$PATH:/osxcross/target/bin:/usr/lib/go-1.14/bin" -RUN apt-get update && apt-get upgrade -y && \ - apt-get install -y --no-install-recommends \ +RUN apt-get update && apt-get upgrade --yes && \ + apt-get install --yes --no-install-recommends \ build-essential \ make cmake \ git curl wget \ libappindicator3-dev libgtk-3-dev \ webkit2gtk-4.0 \ - mingw-w64 upx-ucl python snapcraft \ + mingw-w64 upx-ucl python snapcraft snapd \ unzip \ devscripts fakeroot debhelper \ clang llvm-dev libxml2-dev uuid-dev \ libssl-dev bash patch tar \ xz-utils bzip2 gzip sed cpio libbz2-dev \ - software-properties-common dh-golang && \ + software-properties-common dh-golang \ + jq \ + squashfs-tools && \ add-apt-repository -y ppa:longsleep/golang-backports && \ apt-get update && \ - apt-get install -y --no-install-recommends golang-1.12-go golang-golang-x-tools-dev && \ + 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 @@ -58,6 +60,12 @@ RUN git clone https://github.com/VantaInc/xar && \ ./autogen.sh && ./configure && \ make && sudo make install +# Grab the core18 snap (which snapcraft uses as a base) from the stable channel +# and unpack it in the proper place, to speed up snapcraft builds in the containers. +RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/core18' | jq '.download_url' -r) --output core18.snap +RUN mkdir -p /snap/core18 +RUN unsquashfs -d /snap/core18/current core18.snap + # cache go modules RUN rm -rf /gomods && mkdir -p /gomods/packages WORKDIR /gomods @@ -66,3 +74,11 @@ COPY mods/packages/ /gomods/packages/ RUN go mod download COPY builder.sh / + +# Generate locale. +RUN apt-get update && apt-get dist-upgrade --yes && apt-get install --yes sudo locales && locale-gen en_US.UTF-8 + +# Set the proper environment. +ENV LANG="en_US.UTF-8" +ENV LANGUAGE="en_US:en" +ENV LC_ALL="en_US.UTF-8" |