github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 02:51:55 +00:00
Code Issues Projects Releases Wiki Activity
971 Commits 1 Branch 27 Tags 240 MiB
821b329f7b
Commit Graph

971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
e1ca7e5ab1 Merge pull request #208 from justincormack/1.12-dev 
Update to docker 1.12-dev plus proxy patches, close to what will be rc1
 2016-06-14 14:15:19 +01:00
Justin Cormack
dd5fe0455b Update to docker 1.12-dev plus proxy patches, close to what will be rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-14 14:13:36 +01:00
Ian Campbell
62f414da6b Use $ntpsrv from DHCP to configure chrony 
The existing `ntp=gateway` cmdline support overrides this, but is largely
redundant now.

A DHCP derived server will not be given the "trust" directive in the
configuration file, since it is harder to argue that we know we should trust a
server which arrives this way since it depends on the context in which Moby is
running. It's not clear to me that it makes much difference anyway.

This only uses the first server in $ntpsrv, since Piñata will only provide one
and supporting more makes the sed quite a bit more complex.

If `ntp=gateway` is given then we now use $router instead of parsing IP output.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-14 14:06:53 +01:00
Justin Cormack
ed34c13840 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
9d3483736e Merge pull request #206 from justincormack/openssl 
add openssl for wget helper
 2016-06-13 17:27:22 +01:00
Justin Cormack
72023a505a add openssl for wget helper 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 17:26:29 +01:00
Justin Cormack
fa2e71459b Merge pull request #205 from justincormack/criu 
Add CRIU support
 2016-06-13 16:41:43 +01:00
Justin Cormack
9c426928ef 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
4babbfb749 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
7f99dffed7 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
51b049c836 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
6aeedee2f9 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
e46d2a1408 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
e99beca495 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
7c0c83b01c Merge pull request #202 from justincormack/nosyslogrestart 
remove syslog restart from setup-disk
 2016-06-13 13:44:55 +01:00
Justin Cormack
d7e5c199b1 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
a0f2582aba 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
4d4ea240a8 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
6625be95a5 Merge pull request #200 from justincormack/runlevels 
Fix startup issues
 2016-06-13 11:51:33 +01:00
Justin Cormack
bedc68cb17 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
cb827b9521 missing /proc.mounts 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 10:40:10 +01:00
Justin Cormack
ed600a1cc1 Merge pull request #199 from justincormack/runlevels 
make runlevels closer to standard alpine
 2016-06-10 18:46:36 +01:00
Justin Cormack
64d4ec65bb 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
2dae4f955d 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
6545a19b8e 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
31607a9a2b 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
a9fa07fd73 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
31c5b24513 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
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