diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-10-04 01:32:18 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-10-19 12:34:26 -0400 |
| commit | 1f4a01158a46a175dcdead2310c1d06512505825 (patch) | |
| tree | 0c2719527bfa89752d7bc02f2784582199a6dc8a | |
| parent | 0b6926ea8f644aa1d5412784fd13c99cf69ab3b2 (diff) | |
[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.
| -rw-r--r-- | pkg/windows/Makefile | 16 | ||||
| -rw-r--r-- | pkg/windows/docker-compose.yml | 10 |
2 files changed, 24 insertions, 2 deletions
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 |