From c9732daffabf86bdf825dabe22949da061f9e08f Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Mon, 1 Oct 2018 23:58:37 +0200
Subject: [pkg] add docker files to build riseup-vpn

---
 README.rst        | 40 ++++++++++++++++++++++++++++++++++++++++
 README.txt        | 40 ----------------------------------------
 docker/Dockerfile | 23 +++++++++++++++++++++++
 docker/Makefile   | 10 ++++++++++
 4 files changed, 73 insertions(+), 40 deletions(-)
 create mode 100644 README.rst
 delete mode 100644 README.txt
 create mode 100644 docker/Dockerfile
 create mode 100644 docker/Makefile

diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..4408627
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,40 @@
+RiseupVPN
+=========
+
+Anonymous VPN. Easy, fast, secure.
+
+This repo has everything needed to build RiseupVPN on different platforms
+(windows, mac, linux).
+
+RiseupVPN is a branded build of Bitmask Lite, written in go.
+
+
+Dependencies
+------------
+
+* golang
+* make
+* python (python3, for build scripts)
+
+Dependencies (Windows)
+------------------------
+
+* nsis
+* nssm
+
+Building (Windows)
+------------------
+
+make deps_win
+make openvpn_win
+make build_win
+
+Cross-compiling openvpn for windows
+-----------------------------------
+
+# TODO - modify to build statically and with polarssl.
+
+apt install gcc-mingw-w64-x86-64
+git clone https://github.com/OpenVPN/openvpn-build
+cd openvpn-build/windows-nsis
+CHOST=x86_64-w64-mingw32 CBUILD=i686-pc-cygwin ./build
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 1fe47d8..0000000
--- a/README.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-RiseupVPN
------------------------
-
-Anonymous VPN. Easy, fast, secure.
-
-This repo has everything needed to build RiseupVPN on different platforms
-(windows, mac, linux).
-
-RiseupVPN is a branded build of Bitmask Lite, written in go.
-
-
-Dependencies
-------------------------
-
-* golang
-* make
-* python (python3, for build scripts)
-
-Dependencies (Windows)
-------------------------
-
-* nsis
-* nssm
-
-Building (Windows)
-------------------------
-
-make deps_win
-make openvpn_win
-make build_win
-
-Cross-compiling openvpn for windows
------------------------------------
-
-# TODO - modify to build statically and with polarssl.
-
-apt install gcc-mingw-w64-x86-64
-git clone https://github.com/OpenVPN/openvpn-build
-cd openvpn-build/windows-nsis
-CHOST=x86_64-w64-mingw32 CBUILD=i686-pc-cygwin ./build
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..f0b902f
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,23 @@
+# An image to build and package the go binary for Bitmask Lite (RiseupVPN)
+# LEAP Encryption Access Project 2018
+FROM debian:stretch
+
+MAINTAINER LEAP Encryption Access Project <info@leap.se>
+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
diff --git a/docker/Makefile b/docker/Makefile
new file mode 100644
index 0000000..f30c7a9
--- /dev/null
+++ b/docker/Makefile
@@ -0,0 +1,10 @@
+IMAGE=bitmask-systray
+
+build:
+	docker build -t 0xacab.org:4567/leap/docker/$(IMAGE):latest .
+push:
+	docker push 0xacab.org:4567/leap/docker/$(IMAGE):latest
+prune:
+	docker system prune
+login:
+	docker login 0xacab.org:4567
-- 
cgit v1.2.3