From 1f4a01158a46a175dcdead2310c1d06512505825 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Tue, 4 Oct 2016 01:32:18 -0400
Subject: [pkg] disable openvpn for windows bundle for now

Also, add a variant to keep the docker builds around, bandwidth is
expensive in some parts of the world.
---
 pkg/windows/Makefile           | 16 +++++++++++++++-
 pkg/windows/docker-compose.yml | 10 +++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'pkg')

diff --git a/pkg/windows/Makefile b/pkg/windows/Makefile
index c2494b4..41d6819 100644
--- a/pkg/windows/Makefile
+++ b/pkg/windows/Makefile
@@ -4,7 +4,8 @@ all:
 	$(MAKE) bundle
 
 bundle:
-	$(MAKE) openvpn
+	# Disabling openvpn for now...
+	# $(MAKE) openvpn
 	$(MAKE) pyinstaller
 	$(MAKE) installer
 
@@ -17,6 +18,19 @@ openvpn:
 installer:
 	docker-compose run --rm installer
 
+
+# variant to keep the containers around
+# and save some bandwith
+
+pyinstaller_keep:
+	docker-compose run pyinstaller
+
+openvpn_keep:
+	docker-compose run openvpn
+
+installer_keep:
+	docker-compose run installer
+
 clean:
 	docker rmi windows_pyinstaller
 	docker rmi windows_openvpn
diff --git a/pkg/windows/docker-compose.yml b/pkg/windows/docker-compose.yml
index 92b310c..1368836 100644
--- a/pkg/windows/docker-compose.yml
+++ b/pkg/windows/docker-compose.yml
@@ -1,3 +1,5 @@
+# PYINSTALLER 
+# ============================================================================
 # mingw environment to build dependency binaries in a reproducible environment
 # https://wiki.debian.org/ReproducibleBuilds
 # service to build a windows executable using pyinstaller
@@ -12,11 +14,14 @@ pyinstaller:
     - ../../:/var/src/bitmask:ro
 # produced binaries
     - ../../build:/var/build
+
+# OPENVPN
+# ============================================================================
 # service to build a windows-executable from openvpn sources
 # uses the openvpn-build infrastructure to produce
 # build/executables/openvpn/*
 # produces the openvpn.exe and provides openssl that is to be
-# used by pyinsaller
+# used by pyinstaller
 # usage: docker-compose run --rm openvpn
 # non-zero exit code on failure
 openvpn:
@@ -26,6 +31,9 @@ openvpn:
     - ../../:/var/src/bitmask:ro
 # produced binaries
     - ../../build:/var/build
+
+# INSTALLER 
+# ============================================================================
 # service to compile a installer using nullsoft installer
 # nsis environment to build installer (exe) that contains all required binaries
 # for a clean, just installed windows machine
-- 
cgit v1.2.3