Commit Graph

9 Commits

Author SHA1 Message Date
Justin Cormack
2efda11b65 remove transfused dependency from hostsettings by putting log mounts in docker startup
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-10 11:26:32 +01:00
Rolf Neugebauer
630e0e4e2e net: add metric to static IP address entries
The VPN interface is configure with a routing metric of 199. If VPN mode
is enabled and we have static IP address configured (which is what we do
on Windows) then all traffic would still go via eth0 and not, as expected,
via the VPN interface.

With this PR we set the metric for eth1 to 200, thus, if VPN mode enabled
traffic will be routed over the VPN interface.

This fix is a bit Uggh, but it's the simplest way to apply this late in the
release cycle without requiring re-run of all OS X tests.

We should fix this properly after this release.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-06-01 19:59:58 +01:00
Ian Campbell
98981908b8 Ensure /var/log is bind mounted after transfused starts
Otherwise /Mac$DRIVERDIR does not yet exist.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-05-31 15:26:41 +01:00
Rolf Neugebauer
b557d5d9b7 config: overwrite resolv.conf and interfaces from database
Allow the host to configure a static IP address for eth0 by setting the
following DB keys:
- net/config: "static" (default or not set -> dhcp)
- net/address: IP address
- net/netmask: netmask in dot notation
- net/gateway: default gateway

Also allow overwriting/setting "/etc/resolve.conf" by writing to
the "etc/resolv.conf" key.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-05-30 10:01:42 +02:00
Justin Cormack
2c40ed9554 define driverdir in host setting
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-27 12:04:49 -07:00
Justin Cormack
3f513f2368 move log mount to hostsettings not docker startup
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-27 11:41:46 -07:00
Justin Cormack
43fde211f6 remove ability to set hostname as no longer needed. Hard code llmnrd name as 'docker'
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-04 13:02:26 +01:00
David Sheets
1082da6d85 hostsettings: correctly install multiline /etc/sysctl.conf files
echo will destroy newlines in arguments.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-04-15 10:57:32 +01:00
Justin Cormack
793265c48d rename database to hostsettings
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-07 15:11:20 +01:00