github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-31 14:41:10 +00:00
Code Issues Projects Releases Wiki Activity
735 Commits 1 Branch 27 Tags 240 MiB
c2c0cb98ce
Commit Graph

735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rolf Neugebauer
cdfc424823 go: add the logrus package used by the proxy 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-19 11:49:49 +01:00
Rolf Neugebauer
2e14f1c2a9 go: vendor shared hvsock/vsock packages 
These packages will be shared by a number of utilities
so vendoring them in a shared place.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-19 11:49:49 +01:00
Rolf Neugebauer
56ab75386f kernel: enable VFAT and ISO9660 Filesystems in the kernel 
DOS filesystems are handy for embedded development. ISO FS was
requested/suggested somewhere on a forum.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-19 10:35:53 +01:00
Justin Cormack
92f6148566 Merge pull request #136 from dave-tucker/proxy_2 
Only watch proxy if keys are in the db
 2016-05-18 07:47:44 -05:00
Dave Tucker
50412a6769 Only watch proxy if keys are in the db 
My last change fails if the proxy keys aren't in the db...

Signed-off-by: Dave Tucker <dt@docker.com>
 2016-05-18 11:23:02 +01:00
Justin Cormack
8977f9b358 Merge pull request #135 from justincormack/buildbase 
use build-base not alpine-sdk as smaller
 2016-05-17 10:01:32 -05:00
Justin Cormack
a66704fdc6 use build-base not alpine-sdk as smaller 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-17 10:00:58 -05:00
Justin Cormack
e3633f9d8e Merge pull request #128 from dave-tucker/proxy 
Write Proxy Settings in Docker Init Script
 2016-05-17 08:03:29 -05:00
Justin Cormack
a4027a5ce9 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
2fefa65a6a 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
9ae4438222 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
a720403140 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
354c62a6df 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
3a02f608d5 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
4c1c51d723 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
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