github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity
993 Commits 1 Branch 27 Tags 240 MiB
4c68383d56
Commit Graph

993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
57cf060668 start hwclock in boot runlevel 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-10 11:10:28 +01:00
Justin Cormack
0ffc54bfaa Revert "Revert "Merge pull request #184 from justincormack/repositories" (#195)" 
This reverts commit 34d44e20d4.
 2016-06-10 10:52:13 +01:00
David Sheets
7219b18964 Revert "Merge pull request #184 from justincormack/repositories" (#195) 
This reverts commit ae1e96055c, reversing
changes made to 99dfa4e4c1.
 2016-06-10 10:28:07 +01:00
Justin Cormack
74a0b532b2 Merge pull request #192 from dsheets/transfused-quiet-tmp-clean 
transfused: use find rather than rm+glob to clean up /tmp
 2016-06-09 11:40:12 +01:00
Justin Cormack
47bc16287b Merge pull request #191 from justincormack/waitboot 
start klogd in same runlevel as syslogd
 2016-06-09 11:39:15 +01:00
Justin Cormack
50efe5966e start klogd in same runlevel as syslogd 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-09 11:38:24 +01:00
David Sheets
ede31ffe5b transfused: use find rather than rm+glob to clean up /tmp 
This avoids annoying error messages about . and ..

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-06-09 11:27:59 +01:00
Justin Cormack
fb87dcc359 Merge pull request #189 from dsheets/transfused-clean-up-tmp 
transfused: clean up /tmp
 2016-06-08 15:22:48 +01:00
David Sheets
903e6430d9 transfused: replace space indentation in rc script with tabs for consistency 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-06-08 15:16:43 +01:00
David Sheets
e725aa7d47 transfused: remove anything in /tmp before starting 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-06-08 15:16:43 +01:00
Justin Cormack
a798abb59b Merge pull request #188 from ijc25/clean-or-true 
Add `|| true` to the `docker rmi` invocations in the clean target
 2016-06-08 14:10:10 +01:00
Ian Campbell
5165a6c795 Add || true to the docker rmi invocations in the clean target 
Linux xargs calls the command with no arguments if it gets no inputs, which
`docker rmi` complains about. It provides -r / --no-run-if-empty to prevent
this but unfortunately this isn't supported on OSX.

Ignore errors from `docker rmi` so that `make clean` will keep going and clean
up later stuff.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-08 13:59:47 +01:00
Justin Cormack
35ee340e46 Merge pull request #187 from rneugeba/diag-up 
diagnostics: Add daemon.json to the diagnistics tarball
 2016-06-08 13:54:18 +01:00
Rolf Neugebauer
e56be71ba3 diagnostics: Add daemon.json to the diagnistics tarball 
With #186 we are now using /etc/docker/daemon.json again.
Add it to the tarball.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-06-08 13:51:59 +01:00
Justin Cormack
d30636d93e Merge pull request #186 from justincormack/configsimplify 
remove special treatment of /etc/docker/daemon.conf as we no longer h…
 2016-06-08 13:48:40 +01:00
Justin Cormack
30eeba673a 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
Justin Cormack
087189b0f9 Merge pull request #185 from ijc25/ntp-against-host 
Point chronyd at gateway when ntp=gateway is given on the kernel cmdl…
 2016-06-08 13:36:22 +01:00
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