From 3520dfb78dd518cd9b409aa9608ea81bd51d3a1f Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Wed, 3 Oct 2018 14:44:49 +0200 Subject: [ci] base docker image in ubuntu snapcraft is not properly packaged for debian --- docker/Dockerfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index f0b902f..774da24 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,23 +1,25 @@ # An image to build and package the go binary for Bitmask Lite (RiseupVPN) -# LEAP Encryption Access Project 2018 -FROM debian:stretch +# (c) LEAP Encryption Access Project 2018 +FROM ubuntu:18.04 MAINTAINER LEAP Encryption Access Project LABEL Description="An image to build Bitmask Lite" Vendor="LEAP" Version="1.0" -# we need nsis >= 3.0 -RUN echo 'deb http://http.debian.net/debian testing main' >> /etc/apt/sources.list RUN apt update && apt upgrade -y # Install all the deps for building bitmask-systray # and riseup-vpn -RUN apt install -y --no-install-recommends -t testing nsis RUN apt install -y --no-install-recommends \ - build-essential \ - make \ - curl wget \ - golang libappindicator3-dev libgtk-3-dev \ - mingw-w64 upx-ucl python -RUN apt install -y python3-pip -RUN pip3 install snapcraft + build-essential \ + make \ + git curl wget \ + golang libappindicator3-dev libgtk-3-dev \ + mingw-w64 upx-ucl python snapcraft \ + unzip + +# we need nsis >= 3.0 +RUN echo 'deb http://archive.ubuntu.com/ubuntu cosmic universe' >> /etc/apt/sources.list +RUN apt update +RUN apt install -y --no-install-recommends -t cosmic nsis + -- cgit v1.2.3