From 718d5f7488d87dd60b172c0f19aaedfb5b2b3b64 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Fri, 13 Dec 2019 14:52:21 +0100
Subject: [ci] grab newest nsis version, backup copy of nssm

---
 branding/templates/makefile/Makefile | 10 ++++++----
 docker/Dockerfile                    | 12 +++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile
index 39c4a50..8acb01a 100755
--- a/branding/templates/makefile/Makefile
+++ b/branding/templates/makefile/Makefile
@@ -108,10 +108,12 @@ clean:
 staging\nssm.exe:
 	xcopy /y "C:\ProgramData\chocolatey\lib\NSSM\tools\nssm.exe" $(STAGING)
 staging/nssm.exe:
-	wget https://nssm.cc/release/nssm-2.24.zip -O $(STAGING)/nssm.zip
-	unzip $(STAGING)/nssm.zip -d $(STAGING)
-	mv $(STAGING)/nssm-*/win32/nssm.exe $(STAGING)
-	rm -rf $(STAGING)/nssm-* $(STAGING)/nssm.zip
+	#wget https://nssm.cc/release/nssm-2.24.zip -O $(STAGING)/nssm.zip
+	#unzip $(STAGING)/nssm.zip -d $(STAGING)
+	#mv $(STAGING)/nssm-*/win32/nssm.exe $(STAGING)
+	#rm -rf $(STAGING)/nssm-* $(STAGING)/nssm.zip
+	# BACKUP IN CASE THE OFFICIAL SITE IS UNAVAILABLE
+	wget https://downloads.leap.se/thirdparty/windows/nssm.exe -O $(STAGING)/nssm.exe
 
 staging\openvpn\openvpn.exe:
 	if not exist staging\openvpn mkdir staging\openvpn
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 && \
-- 
cgit v1.2.3