github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 19:28:09 +00:00
Code Issues Projects Releases Wiki Activity
778 Commits 1 Branch 27 Tags 240 MiB
35309accfb
Commit Graph

778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
35309accfb fix #212 do not let chronyd listen on a port for commands 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 15:28:05 +01:00
Justin Cormack
1b61788c2a Merge pull request #211 from justincormack/docker-1.12.0-rc1 
Docker 1.12.0 rc1
 2016-06-15 10:43:41 +01:00
Justin Cormack
5b7c05c25b reverse on Windows check for diagnostics 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:42:21 +01:00
Justin Cormack
863fa5cb8e default to Docker experimental; later we will need to do multiple builds 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:28:26 +01:00
Justin Cormack
827eefcfa2 update docker to 1.12.0-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:19:31 +01:00
Justin Cormack
7f389136c5 Merge pull request #210 from justincormack/cdrom 
Kernel config for CDROM support (for Azure)
 2016-06-14 22:09:36 +01:00
Justin Cormack
ef4a411284 Merge pull request #209 from djs55/fix-tap-vsockd 
tap-vsockd: make sure the service daemonizes properly
 2016-06-14 15:49:37 +01:00
David Scott
e99d36784b tap-vsockd: make sure the service daemonizes properly 
This tells start-stop-daemon to run tap-vsockd as a daemon, and tells
tap-vsockd not to daemonize itself. This seems to work more reliably
than when tap-vsockd self-daemonizes.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-14 15:16:56 +01:00
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
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