github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-05 16:53:48 +00:00
Code Issues Projects Releases Wiki Activity
620 Commits 1 Branch 27 Tags 240 MiB
3a00fe3849
Commit Graph

620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rolf Neugebauer
3a00fe3849 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
fa11d05a7a 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
2c98dd61c5 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
a92a4b9ce3 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
1c85e91989 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
724ab13668 Merge pull request #125 from justincormack/caps 
use capabilities not privileged for building ISO
 2016-05-11 10:02:46 +01:00
Justin Cormack
b733dcd66e 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
fc370b0c21 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
01e4366f7a 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
382f99529d 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
8657c8a7b3 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
154046b571 Merge pull request #124 from nathanleclaire/aws_readme 
Add README for AWS AMI build
 2016-05-10 09:55:44 +01:00
Nathan LeClaire
442e558c9c 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
a26400fd93 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
138f79c35b add Xen net device 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-07 10:15:10 +01:00
Nathan LeClaire
d10efec30f Revise run instance script 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-05-06 18:03:07 -07:00
Nathan LeClaire
b576b05d3e 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
eb64bfabbd 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
44e0a0c956 add xen blockdev support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-06 17:45:17 +01:00
Justin Cormack
bd4bfe5214 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
e3fdcc1435 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
b230bca794 we already have compressed initrd 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-05 12:09:48 +01:00
Justin Cormack
f86f4bfae4 clean docker.git 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 18:52:22 +01:00
Justin Cormack
2d809c24fc add framebuffer console support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 18:28:06 +01:00
Justin Cormack
24bab71577 Merge pull request #119 from ijc25/vsudd-reduce-logging 
vsudd: Reduce logging
 2016-05-04 15:06:04 +01:00
Ian Campbell
726b9dfc80 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
d6d409ad80 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
c7dbdf1dfc 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
43fde211f6 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
ad14c59d3a 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
aed7f798b0 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
cb3af1dd25 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
a326a8b5ab 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
ae67e725df 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
091645eb3c 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
ae3aec0522 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
d5bd7d690a 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
8c4173b74a Merge pull request #111 from nathanleclaire/cache_kernel_download 
Cache kernel source download
 2016-04-28 08:59:53 +01:00
Nathan LeClaire
54c89599ce Cache kernel source download 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-04-27 22:45:17 +00:00
Justin Cormack
ff1a34c002 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
998e808da1 add resize2fs to build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-27 12:10:23 +01:00
Justin Cormack
564998505f 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
084761b9db 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
Justin Cormack
7d7ff562a7 Remove special case for insecure registry 
This is now in the daemon.json config file see
https://github.com/docker/pinata/issues/2771

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 14:17:16 +01:00
Justin Cormack
100fd737ad Add a local prefix '-moby' to the kernel name 
We are now using a custom kernel not unmodified upstream, so
best to identify it.

Also fix https://github.com/docker/pinata/issues/2153

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 12:25:56 +01:00
Justin Cormack
5c61ee27f3 Switch from busybox mdev to kernel devtmpfs 
This is simpler, and as a by-product should resolve
https://github.com/docker/pinata/issues/1968
as it uses the now-more-correct loop device names
that newer util-linux expects.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-25 12:03:32 +01:00
Justin Cormack
4d912f68c1 tidy up default device creation 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-25 12:00:48 +01:00
Justin Cormack
53af8a1b14 clean up apk cache after install to make image a little smaller 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-25 10:59:36 +01:00
Dave Scott
21bc5b91ea Merge pull request #109 from djs55/fix-udp-proxy 
proxy: add support for UDP
 2016-04-22 18:03:40 +01:00
David Scott
8ad2ba163b proxy: fix gofmt violations 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-22 16:10:36 +01:00