Commit Graph

876 Commits

Author SHA1 Message Date
Ian Campbell
d1e5ba6121 Point chronyd at gateway when ntp=gateway is given on the kernel cmdline.
Reconfigure chronyd in a udhcpc post-bound hook and restart it, but use
conditionalrestart so it is not started if it isn't running, which is the case
during boot when this hook happens from init.d/networking via ifup, running
"service ... start" in that context results in the daemon running but the
service db saying it isn't.

Doing it in the udhcpc hook leaves a nice hole where support for getting the
NTP server via DHCP can fit in once it is available.

This also switches from using "initstepslew" to "makestep", the former was
responsible for the long delay starting chronyd (meaning we can now drop
"before chronyd" from Docker's init dependencies), while the later will force a
step if the time is out by more than the configured amount (half a second
here), meaning it will be corrected on resume. The rest of the time it chrony
will do the usual slewing to keep the clock accurate. Passing -1 as the limit
to "makestep" ensures the step will always occur, if it were positive it would
only be done that number of times.

We add "iburst" and "minpoll 2" to the default configuration file to speed up
initial sync and resync after sleep respectively, resync after sleep happens in
a couple of seconds. In "ntp=gateway" mode we also patch in "trust", this isn't
in the default config file since we won't be so sure about DHCP provided
servers, but when talking to a host provided NTP we want to use its time (for
sync accross host mounts) even if it has a crazy idea about what the time is.

With this we can also remove the 15min ntp sync, which in turn gets rid of the
need for cron.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-06-08 13:19:35 +01:00
Justin Cormack
95291e9733 Merge pull request #184 from justincormack/repositories
Move to 3.4 repositories, openrc
2016-06-08 12:45:53 +01:00
Justin Cormack
76d71e035d Move to 3.4 repositories, openrc
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-08 12:45:07 +01:00
Justin Cormack
87f36081c9 Merge pull request #182 from dsheets/transfused-service-start-mounts
transfused service delay start until mounts are ready
2016-06-07 22:27:39 +01:00
David Sheets
06f1a5b81f transfused: remove rc script cruft
Signed-off-by: David Sheets <dsheets@docker.com>
2016-06-07 22:22:23 +01:00
David Sheets
67dd25d1ba transfused: when starting, wait up to 2s for pidfile to appear
pidfile appearance is triggered by start-up mount completion.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-06-07 22:21:16 +01:00
David Sheets
b58448fdf5 transfused: update control protocol (#181)
Add a mount suitability predicate, a pong reply message type, and a log
notice message type. Also, fixes the multi-line mount point printing issue.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-06-07 19:13:52 +01:00
Justin Cormack
0a493c1fb7 Merge pull request #180 from rneugeba/update-diag
Improve diagnostics
2016-06-07 16:22:24 +01:00
Rolf Neugebauer
59ed40b5ed diagnostics: dump more config files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-06-07 16:00:16 +01:00
Rolf Neugebauer
1fa702886b diagnostics: dump the master branch of the database
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-06-07 16:00:16 +01:00
Rolf Neugebauer
218e9de40c diagnostics: add more log files and more content from logfiles
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-06-07 15:04:17 +01:00
Justin Cormack
05178c2c13 Merge pull request #178 from mavenugo/ipvs
Enabling IPVS kernel configs to support built-in load-balancing
2016-06-06 23:36:38 +01:00
Madhu Venugopal
9d7835d6c4 Enabling IPVS kernel configs to support built-in load-balancing
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-06 15:34:30 -07:00
Justin Cormack
9241e0c8df Merge pull request #177 from justincormack/ipvs
add ipvs conntrack and other missing net options
2016-06-06 23:18:19 +01:00
Justin Cormack
98fa1c0ef0 Merge pull request #176 from justincormack/kernelup
update to linux 4.4.12 and aufs 20160530
2016-06-06 23:18:04 +01:00
Justin Cormack
3db42c2753 add ipvs conntrack and other missing net options
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-06 23:17:44 +01:00
Dave Scott
95bd6a899e Merge pull request #155 from djs55/remove-individual-vsock-proxy
proxy: remove the dynamic vsock port allocation
2016-06-06 23:13:24 +01:00
Justin Cormack
6b5c0495f1 update to linux 4.4.12 and aufs 20160530
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-06 23:05:41 +01:00
Justin Cormack
d07731577a Merge pull request #174 from dsheets/transfused-prepare-mounts
transfused: introduce automatic mount point preparation
2016-06-03 17:33:21 +01:00
David Sheets
0d0413b264 transfused: introduce automatic mount point preparation
Mount points are now made dynamically if either the leaf doesn't exist
or the leaf has no children. Any proper prefix of the target mount point may
or may not exist prior to mounting.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-06-03 16:31:49 +01:00
Justin Cormack
223ef9f9db Merge pull request #173 from justincormack/wintmp
fix #169 only do /tmp bind mount if /Mac/tmp exists
2016-06-03 15:18:43 +01:00
Justin Cormack
5d80b5dfcd fix #169 only do /tmp bind mount if /Mac/tmp exists
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-03 15:15:20 +01:00
Justin Cormack
0e89621f76 Merge pull request #172 from justincormack/docker-1.11.2
Update docker to 1.11.2+patches
2016-06-03 13:28:11 +01:00
Justin Cormack
7e0f2bdfa7 Update docker to 1.11.2+patches
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-03 13:27:32 +01:00
Justin Cormack
f245c8ab63 Merge pull request #171 from justincormack/alpine3.4
Update to Alpine 3.4
2016-06-03 13:05:40 +01:00
Justin Cormack
e434c70507 Update to Alpine 3.4
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-03 12:45:15 +01:00
Justin Cormack
a450843a48 Merge pull request #168 from MagnusS/mount-tmp
also bindmount /tmp once
2016-06-03 09:07:34 +01:00
Magnus Skjegstad
420f92d3fa also bindmount /tmp once
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2016-06-03 01:44:11 +01:00
Justin Cormack
05a519a7b6 Merge pull request #167 from dave-tucker/nohupper
Remove hupper
2016-06-02 20:44:03 +01:00
Dave Tucker
66372fe5e8 Remove hupper and mobyconfig watch
Signed-off-by: Dave Tucker <dt@docker.com>
2016-06-02 20:39:25 +01:00
Justin Cormack
e769c18281 Merge pull request #166 from justincormack/typo
fix typo
2016-06-02 13:56:46 +01:00
Justin Cormack
5832819473 fix typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-02 13:56:20 +01:00
Justin Cormack
9ad152aa6c Merge pull request #165 from justincormack/bindmount
avoid rebindmounting directories on docker restart
2016-06-02 13:19:21 +01:00
Justin Cormack
35cdbaf458 avoid rebindmounting directories on docker restart
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-02 13:18:27 +01:00
Justin Cormack
d0c8e5de01 Merge pull request #163 from nathanleclaire/bootflag
Add 'bootflag' script to check kernel flags
2016-06-02 11:58:44 +01:00
Nathan LeClaire
810d50aef0 Add 'bootflag' script to check kernel flags
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-06-01 15:30:53 -07:00
Rolf Neugebauer
312f45babb Merge pull request #162 from rneugeba/win-vpn-fix
net: add metric to static IP address entries
2016-06-01 20:10:26 +01:00
Rolf Neugebauer
6c8bcb150a 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
Justin Cormack
14ace6d526 Merge pull request #160 from ijc25/master
Ensure /var/log is bind mounted after transfused starts
2016-05-31 15:39:15 +01:00
Ian Campbell
065374f443 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
Justin Cormack
41d71a29ce Merge pull request #159 from justincormack/diag
update diagnostics now tap-vsockd only runs on WIndows
2016-05-31 15:08:19 +01:00
Justin Cormack
41c1231c47 update diagnostics now tap-vsockd only runs on WIndows
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-31 15:07:33 +01:00
Rolf Neugebauer
be61d79537 Merge pull request #152 from rneugeba/net-config
[DO NOT MERGE (yet)] config: overwrite resolv.conf and interfaces from database
2016-05-30 14:24:37 +02:00
Rolf Neugebauer
81c8a2a53d 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
d14b248205 Merge pull request #158 from justincormack/driverdir
define driverdir in host setting
2016-05-27 12:05:23 -07:00
Justin Cormack
171921dc9e define driverdir in host setting
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-27 12:04:49 -07:00
Justin Cormack
79409e4d00 Merge pull request #157 from justincormack/movemount
move log mount to hostsettings not docker startup
2016-05-27 11:47:39 -07:00
Justin Cormack
a597292272 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
a6ceb0a580 Merge pull request #156 from justincormack/nologcopy
Do not try to keep log files, fix #154
2016-05-26 14:57:53 -07:00
Justin Cormack
4f7f9cd2fa Do not try to keep log files, fix #154
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-26 14:24:05 -07:00