3 Commits

Author	SHA1	Message	Date
Dave Tucker	5a225b9dc5	Makefile: Fix bug where network was not disabled ... This commit moves the include statement to the bottom of the file to ensure that all variables are set before conditionals are evaluated. I also changed the ifndef NETWORK to ifdef NETWORK as the former was incorrect. We want `NET_OPTS="--network=none"` in cases where NETWORK is not defined. Fixes: #2134 Signed-off-by: Dave Tucker <dt@docker.com>	2017-06-30 11:55:08 +01:00
Dave Tucker	adae27b8d1	Simplify Makefiles for Packages ... These now inherit from a top-level package.mk Options like use of the network can be enabled on a per package basis This removes a lot of duplicate code and make the maintenace of these Makefiles much easier Signed-off-by: Dave Tucker <dt@docker.com>	2017-06-22 12:40:03 +01:00
Magnus Skjegstad	24ec30e74c	vpnkit-forwarder: add /pkg/vpnkit-forwarder ... Adds /pkg/vpnkit-forwarder which downloads and builds vpnkit-forwarder and vpnkit-expose-port from moby/vpnkit. Also includes an example for forwarding `sshd` and updates the documentation for `hyperkit` to include a `vpnkit` section. `vpnkit` still requires a 9P mount for coordination, so the `socat` forwarding is simpler to set up at the moment. Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>	2017-06-12 14:46:48 +01:00