github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 10:31:35 +00:00
Code Issues Projects Releases Wiki Activity
8,513 Commits 1 Branch 27 Tags 240 MiB
master
Commit Graph

8513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
8b24be487b Merge pull request #133 from rneugeba/vmbus-up 
kernel: cherry-pick more VMBus patches, fix for yet another kernel crash
 2016-05-17 08:01:20 -05:00
Justin Cormack
7e868001e4 Merge pull request #134 from ncopa/kernel-4.4.10 
update to kernel 4.4.10, aufs 20160516
 2016-05-17 08:00:59 -05:00
Natanael Copa
26ae4693e1 update to kernel 4.4.10, aufs 20160516 
Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-05-17 12:55:24 +02:00
Rolf Neugebauer
61b38236a9 kernel: cherry-pick more VMBus patches, fix for yet another kernel crash 
These are most of the changes to channel.c and channel_mgmt.c from upstream.

They are needed to apply a proposed patch to fix yet another kernel crash
we reported. This patch is also included.

With these patches applied many thousand connections with random data and up
to 10 concurrent connections are sustained without kernel crashes.

This patch also updates the core Hyper-V socket support to v11 (which
also obsoletes the previous patch added to work around a kernel bug)

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-17 11:06:07 +01:00
Dave Tucker
bbd7a761cf Make hupper watch for proxy changes too 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-05-17 09:04:56 +01:00
Dave Tucker
7318e24b87 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
04d5a39638 Merge pull request #129 from rneugeba/hvsock-fix 
kernel: Fix Null pointer de-reference in af_hvsock code
 2016-05-15 13:01:36 +01:00
Rolf Neugebauer
58b500ccd9 kernel: Fix Null pointer de-reference in af_hvsock code 
The Hyper-V socket patch has a bug which was triggered by a race condition when
the client connected and then immediately closed the connection before the
server would call accept(). This caused a kernel crash.

This patch was discussed with Dexuan Cui <decui@microsoft.com>, the original
author of the Hyper-V socket support.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-15 12:59:55 +01:00
Justin Cormack
42e81e94f3 Merge pull request #127 from rneugeba/hvsockup 
kernel: Update Hyper-V socket patch to v10
 2016-05-13 16:57:02 +01:00
Rolf Neugebauer
8a8896f477 kernel: Update Hyper-V socket patch to v10 
This required pulling in the Qualcom IPC patches as those changed
the socket family enumeration.

All other patches should be the same.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-13 16:14:19 +01:00
Justin Cormack
95c47663a3 Merge pull request #126 from justincormack/nosyslinux 
We do not seem to need syslinux in the image, and it brings in libpng…
 2016-05-11 15:00:30 +01:00
Justin Cormack
259224176f We do not seem to need syslinux in the image, and it brings in libpng and things we do not need 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-11 14:56:58 +01:00
Justin Cormack
d7717d912f Merge pull request #125 from justincormack/caps 
use capabilities not privileged for building ISO
 2016-05-11 10:02:46 +01:00
Justin Cormack
f3a469c848 use capabilities not privileged for building ISO 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-11 10:02:23 +01:00
Justin Cormack
952bb2d3db 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
3c3a89b8c7 add Intel 10g VF for AWS, other useful network options 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-10 11:01:48 +01:00
Justin Cormack
32ddaae7a5 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
Justin Cormack
fe9e4f0f1a update to kernel 4.4.9, aufs 20160509 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-10 10:54:01 +01:00
Justin Cormack
0b4463431c Merge pull request #124 from nathanleclaire/aws_readme 
Add README for AWS AMI build
 2016-05-10 09:55:44 +01:00
Nathan LeClaire
7c4ae31ad6 Add README for AWS AMI build 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-05-09 18:11:04 -07:00
Justin Cormack
9cd184e420 Merge pull request #116 from nathanleclaire/bake_ami 
[WIP] Add structure to enable baking Moby Linux AMI
 2016-05-07 10:17:02 +01:00
Justin Cormack
6165133e8b add Xen net device 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-07 10:15:10 +01:00
Nathan LeClaire
235abdf65e Revise run instance script 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-05-06 18:03:07 -07:00
Nathan LeClaire
04bdb18566 Add structure to enable baking Moby Linux AMI 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-05-06 15:20:53 -07:00
Justin Cormack
39e53686c8 more liberal check for block devices 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-06 23:04:13 +01:00
Justin Cormack
375439e2f9 add xen blockdev support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-06 17:45:17 +01:00
Justin Cormack
06fdbd5818 Merge pull request #122 from ijc25/vsock-upstreamed-fix 
Update vsock patch to version accepted upstream
 2016-05-06 11:41:11 +01:00
Ian Campbell
a806c5cc8d Update vsock patch to version accepted upstream 
No practical change, but adds the "cherry-picked from" to aid tracking. This
has also been queued for stable so will eventually show up in a 4.4.x and can
be dropped from here.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-05-06 10:57:50 +01:00
Justin Cormack
c50683509c we already have compressed initrd 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-05 12:09:48 +01:00
Justin Cormack
25b6f73f37 clean docker.git 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 18:52:22 +01:00
Justin Cormack
ceb7bbf3e4 add framebuffer console support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 18:28:06 +01:00
Justin Cormack
5570d5d125 Merge pull request #119 from ijc25/vsudd-reduce-logging 
vsudd: Reduce logging
 2016-05-04 15:06:04 +01:00
Ian Campbell
b4722c2533 vsudd: Reduce logging 
Previously the logs for a single connection would be something like:

2016/05/04 12:44:41 171 Accepted connection on fd 5 from 00000002.00010006
2016/05/04 12:44:41 171 Connected to docker &{{0xc82008a5b0}}
2016/05/04 12:44:44 171 copying from vsock to docker:  4465 bytes done
2016/05/04 12:44:44 171 copying from docker to vsock:  1324 bytes done
2016/05/04 12:44:44 171 Done. read: 4465 written: 1324
2016/05/04 12:44:44 171 Closing docker &{{0xc82008a5b0}}
2016/05/04 12:44:44 171 Closing vsock &{0xc820086840}

The "Connected" and "Closing" lines are not useful now that it is debugged and
working well. The "copying..." lines are redundant with the "Done" line. Reduce
to just:

2016/05/04 14:00:41 4 Accepted connection on fd 10 from 00000002.00010003
2016/05/04 14:00:41 4 Done. read: 90 written: 145

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-05-04 15:01:47 +01:00
Justin Cormack
921aaa895e reread partition table and be more careful if no partitions 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 14:56:17 +01:00
Justin Cormack
63f5178cf8 add nfs client and server support, fix #117 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 13:24:48 +01:00
Justin Cormack
f7fa90b181 remove ability to set hostname as no longer needed. Hard code llmnrd name as 'docker' 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 13:02:26 +01:00
Justin Cormack
ea5636df85 Merge pull request #118 from ijc25/issue2899 
Add bugfix patch for partial AF_VSOCK shutdown
 2016-05-03 17:58:19 +01:00
Ian Campbell
7ae99c1b51 Add bugfix patch for partial AF_VSOCK shutdown 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-05-03 17:27:14 +01:00
Justin Cormack
d85112bce7 Merge pull request #115 from djs55/docker-init 
docker: argument is now "--userland-proxy-path"
 2016-04-29 15:02:52 +01:00
David Scott
34b0d7dc1a 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
59e8fd98b1 Merge pull request #114 from djs55/docker.1.11.1 
Update docker to 1.11.1
 2016-04-29 14:15:34 +01:00
Justin Cormack
106ef4e5bc Merge pull request #113 from djs55/fix-ucp-proxy 
proxy: bind the IP port as well as the vsock port
 2016-04-29 14:05:23 +01:00
David Scott
fd3c26feae Update docker to 1.11.1 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-29 14:00:45 +01:00
David Scott
198dc8ba73 proxy: bind the IP port as well as the vsock port 
Previously the proxy would listen only on the vsock port, which is
fine for accessing the port on the host, but if a container also wants
to access the port (e.g. via `--net=host` and using the Moby IP) then
we need to listen on the IP too.

Related to [docker/pinata#2854]

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-29 13:53:02 +01:00
Justin Cormack
d00fd8bff3 Merge pull request #111 from nathanleclaire/cache_kernel_download 
Cache kernel source download
 2016-04-28 08:59:53 +01:00
Nathan LeClaire
6ade5f97e9 Cache kernel source download 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-04-27 22:45:17 +00:00
Justin Cormack
80c3b91b86 resize data partition if possible, allows disk to grow 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-27 12:13:11 +01:00
Justin Cormack
7ec5e0b741 add resize2fs to build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-27 12:10:23 +01:00
Justin Cormack
281d6a21de add oom killer config, so containers die before system daemons, fix #110 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 16:00:36 +01:00
Justin Cormack
c470c2f0fa remove mdnstool now we are only using hostnet 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 14:45:50 +01:00