github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-30 05:51:26 +00:00
Code Issues Projects Releases Wiki Activity
1,032 Commits 1 Branch 27 Tags 240 MiB
202cb42a84
Commit Graph

1032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
7a9320b931 Kernel config for CDROM support (for Azure) 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-14 11:30:47 +01:00
Justin Cormack
d99deeb003 Merge pull request #206 from justincormack/openssl 
add openssl for wget helper
 2016-06-13 17:27:22 +01:00
Justin Cormack
f4f41efe09 add openssl for wget helper 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 17:26:29 +01:00
Justin Cormack
8b4ca18b10 Merge pull request #205 from justincormack/criu 
Add CRIU support
 2016-06-13 16:41:43 +01:00
Justin Cormack
3bd4a67fd7 Add CRIU support 
Also enables expert so a bunch of other options showing

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 16:33:31 +01:00
Justin Cormack
a5e72ac917 Merge pull request #204 from justincormack/kernelup 
update kernel to 4.4.13 and aufs to 20160613
 2016-06-13 15:14:20 +01:00
Justin Cormack
50536e6aa7 update kernel to 4.4.13 and aufs to 20160613 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 15:06:25 +01:00
Justin Cormack
7d73182c45 Merge pull request #196 from rneugeba/win-proxy-fix 
proxy: fix handling of CloseRead/CloseWrite for TCP port proxy
 2016-06-13 14:22:30 +01:00
Justin Cormack
b99befab17 Merge pull request #201 from ijc25/bind-aside-original-var-log 
Bind aside original var log
 2016-06-13 14:22:22 +01:00
Justin Cormack
0ac2c6eb5c Merge pull request #203 from justincormack/deps 
Revert "start automount after syslog as it tries to restart it"
 2016-06-13 14:22:02 +01:00
Justin Cormack
96ab15bc4b Revert "start automount after syslog as it tries to restart it" 
This reverts commit 8276becaf1.
 2016-06-13 14:18:05 +01:00
Justin Cormack
05537f511c Merge pull request #202 from justincormack/nosyslogrestart 
remove syslog restart from setup-disk
 2016-06-13 13:44:55 +01:00
Justin Cormack
96d0225bbf remove syslog restart from setup-disk 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 13:44:06 +01:00
Ian Campbell
c5940b3479 Bind the original /var/log onto /run/log 
So that it can be inspected while debugging.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-13 12:07:26 +01:00
Ian Campbell
a2ba682878 Use /proc/mounts in docker init script 
Switch one instance of /etc/mtab.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-13 12:07:26 +01:00
Justin Cormack
9fe395c180 Merge pull request #200 from justincormack/runlevels 
Fix startup issues
 2016-06-13 11:51:33 +01:00
Justin Cormack
8276becaf1 start automount after syslog as it tries to restart it 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 11:51:03 +01:00
Justin Cormack
41f39f7efe missing /proc.mounts 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 10:40:10 +01:00
Justin Cormack
ec76c476ab Merge pull request #199 from justincormack/runlevels 
make runlevels closer to standard alpine
 2016-06-10 18:46:36 +01:00
Justin Cormack
6f12be49b3 make runlevels closer to standard alpine 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-10 18:43:16 +01:00
Ian Campbell
83a6e9ba81 Merge pull request #198 from ijc25/reenable-ext4-uninit_bg 
Add /etc/mke2fs.conf reenabling the uninit_bg feature
 2016-06-10 18:42:41 +01:00
Ian Campbell
52eaf66812 Add /etc/mke2fs.conf reenabling the uninit_bg feature 
Without this the mkfs.ext4 on Moby on a virtualised OSX goes from ~10s to ~90s.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-10 18:28:57 +01:00
Justin Cormack
d05c9b7183 Merge pull request #197 from justincormack/clockfix 
revert 3.3 downgrade, clean up some startup scripts
 2016-06-10 18:27:42 +01:00
Rolf Neugebauer
ebf7c5fede proxy: fix handling of CloseRead/CloseWrite for TCP port proxy 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-06-10 16:05:14 +01:00
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
Justin Cormack
ab873af79b start hwclock in boot runlevel 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-10 11:10:28 +01:00
Justin Cormack
405784224d Revert "Revert "Merge pull request #184 from justincormack/repositories" (#195)" 
This reverts commit 34d44e20d4.
 2016-06-10 10:52:13 +01:00
David Sheets
34d44e20d4 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
f75047d21c 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
123648fab1 Merge pull request #191 from justincormack/waitboot 
start klogd in same runlevel as syslogd
 2016-06-09 11:39:15 +01:00
Justin Cormack
ca767fca66 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
a84e4ecfdd 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
1a2b981622 Merge pull request #189 from dsheets/transfused-clean-up-tmp 
transfused: clean up /tmp
 2016-06-08 15:22:48 +01:00
David Sheets
4090ccf9d0 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
c92ff1d36c 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
3156415fc4 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
b8a7032161 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
667d2bc9c5 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
a923d92338 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
326faef15a 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
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
Justin Cormack
20176dd76f 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
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
ae1e96055c Merge pull request #184 from justincormack/repositories 
Move to 3.4 repositories, openrc
 2016-06-08 12:45:53 +01:00
Justin Cormack
ca6663b9a3 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
99dfa4e4c1 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
c6cc814454 transfused: remove rc script cruft 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-06-07 22:22:23 +01:00
David Sheets
c2c0cb98ce 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
d605e6df30 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
7bdbfd96c4 Merge pull request #180 from rneugeba/update-diag 
Improve diagnostics
 2016-06-07 16:22:24 +01:00