github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-07 14:56:54 +00:00
Code Issues Projects Releases Wiki Activity
745 Commits 1 Branch 31 Tags
667d2bc9c56c07b6f591eb2d87b4466bcbf78eb9
Commit Graph

65 Commits

Author SHA1 Message Date
Justin Cormack
5b4ebde5f7 remove special treatment of /etc/docker/daemon.conf as we no longer have a watch on it 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-08 13:47:09 +01:00
Ian Campbell
de6e7f9cbe 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
1fab4151ef 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
Magnus Skjegstad
9c5aee352d also bindmount /tmp once 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
 2016-06-03 01:44:11 +01:00
Justin Cormack
2c6ba517e9 fix typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-02 13:56:20 +01:00
Justin Cormack
e94dff4d11 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
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
50bb644acb 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
Dave Tucker
3a02f608d5 Set proxy setting in Docker init script 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-05-16 12:07:01 +01:00
Justin Cormack
fc370b0c21 Revert "replace chronyd with sntpc, sync every 15s not 15m" 
We should not use ntp.org this frequently, need to work out something
that uses host time mainly.

This reverts commit 382f99529d.
 2016-05-10 11:29:16 +01:00
Justin Cormack
382f99529d replace chronyd with sntpc, sync every 15s not 15m 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-10 11:00:51 +01:00
David Scott
a326a8b5ab docker: argument is now "--userland-proxy-path" 
This was changed from "--userland-proxy-bin" in response to review
feedback.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-29 14:56:36 +01:00
Justin Cormack
7d7ff562a7 Remove special case for insecure registry 
This is now in the daemon.json config file see
https://github.com/docker/pinata/issues/2771

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 14:17:16 +01:00
Rolf Neugebauer
242a505bc1 shutdown: use poweroff -f instead of halt -f 
This is makes fast shutdown work on Hyper-V

While at it, also clean up whitespaces. The file was mixed
tabs and spaces. Now it uses spaces.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-15 15:10:28 +01:00
Justin Cormack
b76032f9fe clean up config options 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 11:09:55 +01:00
Justin Cormack
43c22fcffa change find to use keys, fix /etc/docker copying using find 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 14:03:43 +01:00
Justin Cormack
167123a363 add insecure registry support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:47:44 +01:00
Justin Cormack
885cdd15f9 allow use of any files under /etc/docker eg /etc/docker/certs.d/ 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:28:15 +01:00
Justin Cormack
6859c551ee more uses of moobyconfig in docker config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:14:19 +01:00
Justin Cormack
6b396e200c use mobyconfig some more in docker config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:06:55 +01:00
Justin Cormack
09a98bf3e2 remove 9pudc, unused and not being fixed 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-04 18:21:01 +01:00
David Scott
edcf29c5e4 docker: if network=slirp or native/port-forwarding=true, forward ports 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-04 12:41:45 +01:00
Justin Cormack
249151a445 Increase p and n ulimits to match boot2docker, fixes #64 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-04 11:44:27 +01:00
Justin Cormack
6d890f007b switch root to a tmpfs filesystem, so pivot_root works, should make #57 work now 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-29 22:09:23 +01:00
Justin Cormack
5fc48fbf70 clean up log transfer 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-18 11:20:28 +00:00
Justin Cormack
33d6a8adf0 fix typo properly 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 19:47:14 +00:00
Justin Cormack
2c172c040b typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 18:27:42 +00:00
Justin Cormack
0c75abcb3e shift logs to host before docker startup, keep old logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 15:27:50 +00:00
Justin Cormack
9d3c651aba add log message for starting docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 14:28:55 +00:00
Justin Cormack
09daa77e39 fix docker pidfile, may resolve #44 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-11 11:52:24 +00:00
Justin Cormack
d855ecc326 clean up docker init 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-04 11:50:28 +00:00
Justin Cormack
0e33cf80a0 Do not write ip address to database, no longer needed. 
See discussion in #39.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-04 10:43:01 +00:00
David Scott
f2cf697cc4 Add debugging around writing the "ip" file 
If writing the "ip" file doesn't happen, this should show the reason
why.

Related to #39

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-03-01 09:21:28 +00:00
Justin Cormack
9ed8b91027 Revert "set debug mode on docker daemon" 
This reverts commit 52cce5311a.
 2016-02-24 16:18:47 +00:00
Justin Cormack
52cce5311a set debug mode on docker daemon 
See https://github.com/docker/pinata/issues/827

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-24 14:24:58 +00:00
Justin Cormack
41ecb8ff3e output that we are shutting down docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-19 16:59:38 +00:00
Justin Cormack
e4e5356865 #35 somewhat hacky patch for fast shutdown, just sync filesystems and halt after docker shutdown 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-19 14:53:23 +00:00
Justin Cormack
ff917e07f7 use driverDir not groupDir 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-18 11:19:52 +00:00
Dave Scott
503fe76b13 Merge pull request #31 from djs55/remove-driverDir 
Remove driverDir, use groupDir
 2016-02-17 15:52:21 +00:00
Justin Cormack
1bbaceaf84 bind mount at docker start 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 14:17:40 +00:00
David Scott
3a8c5d77c0 docker: write ip in groupDir, not driverDir 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-17 13:49:41 +00:00
Justin Cormack
2b28fd5124 Merge pull request #30 from djs55/avoid-socket9p 
Use IP rather than socket9p for the docker socket
 2016-02-15 15:15:25 +00:00
David Scott
6e20f932c3 Use IP rather than socket9p for the docker socket 
Before this patch, docker would only listen on 0.0.0.0:2375 if running
on Hyper-V. This patch makes it listen there on all hypervisors.

In the case of xhyve, it will listen on the host internal vmnet network
or the virtual slirp network. We should aim to replace this with a socket-
based transport instead.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-15 15:10:20 +00:00
David Sheets
726650a126 Replace 9pudfuse with transfused 2016-02-12 14:07:43 +00:00
Rolf Neugebauer
205fd57f0c docker: also listen to local unix socket when running on Hyper-V 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-02-05 16:57:47 -08:00
David Sheets
e98073c81e Fix the docker.log output filename 2016-02-04 11:04:18 +00:00
Rolf Neugebauer
031869f371 docker: start docker daemon with network on Hyper-V for now 
On Windows, for now we use DOCKER_HOST and access the docker daemon
on Moby via the network.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-01-28 13:52:24 -08:00
Justin Cormack
f47531f2a9 add a script to move all logs to host 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-27 13:36:36 +00:00
Justin Cormack
01227dc6f6 run docker after 9p fuse 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-27 13:20:45 +00:00
Justin Cormack
de3ee7832c do not set graph driver in moby, use default or get from daemon.json config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-26 12:35:46 +00:00