Commit Graph

2283 Commits

Author SHA1 Message Date
Justin Cormack
636d958b77 Add aufs patch for 4.9 to fix issue with extended attribute removal
See https://github.com/docker/docker/issues/30245

This should hit aufs upstream patch set shortly.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-23 14:01:16 +00:00
David Scott
d6c01556f1 tap-vsockd: add buffering
This patch adds a simple ring buffer implementation and uses it to buffer
the reads and writes to/from the AF_HYPERV socket and tap file descriptor.

This removes the need to perform small reads and writes for the per-packet
headers and allows a read on the Hyper-V socket to block at the same time
as a write to the tap device (and vice-versa)

The configuration in the init.d script is:

- a max message size (individual read or write) of 8192. Experimentally
  this seems to be the largest completely reliable size across the Windows
  versions we can support. Messages of length 16384 sometimes fail.
- a buffer size of 256KiB in each direction.

Single stream TCP throughput as measured by iperf increases modestly, by
another 100Mbit/sec.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-01-23 12:17:52 +00:00
Justin Cormack
a06d77765b Merge pull request #1075 from justincormack/iptables-database
Fix up direct database accesses after move to /Database
2017-01-21 14:34:12 +00:00
Justin Cormack
d308fdac11 Fix up direct database accesses after move to /Database
In #1057 removed the 9p paths from the database mount
but that broke some users accessing them directly. Fix these.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-21 14:32:34 +00:00
Justin Cormack
6e4318badc Merge pull request #1072 from rneugeba/patch-up
Update kernel patches
2017-01-20 17:51:24 +00:00
Riyaz Faizullabhoy
ce0603f124 Merge pull request #1070 from justincormack/aufs-not-if-unsupported
Do not try to use aufs if kernel has no support
2017-01-20 16:34:40 +00:00
Rolf Neugebauer
fc72448ffd kernel: Add VMBus stability improvements
The four new patches prevent swamping VMBus with too many
notifications which, eventually, let Hyper-V assume there is
a DoS attempt and would thus throttle the VM for up to 5s.

The first three new patches were cherry-picked from upstream.
The final patch was received by email. Will update once it
has been submitted/accepted upstream.

Generated from: https://github.com/rneugeba/linux-stable/tree/v4.9.5-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-20 16:15:04 +00:00
Rolf Neugebauer
ed62346b60 kernel: Rebase patches to 4.9.5
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-20 16:05:28 +00:00
Rolf Neugebauer
cfa62c5ca4 kernel: Rebase patches to 4.4.44
Generated from: https://github.com/rneugeba/linux-stable/tree/v4.4.44-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-20 16:01:51 +00:00
Justin Cormack
0818086c41 Merge pull request #1066 from riyazdf/kernup
Upgrade to 4.9.5 and 4.4.44 kernels
2017-01-20 15:44:45 +00:00
Justin Cormack
7bfc23413c Merge pull request #1069 from justincormack/swap-fix
Always mount swap not just when created
2017-01-20 15:42:56 +00:00
Justin Cormack
3e807fc7a0 Do not try to use aufs if kernel has no support
This happens with the Moby mainline kernel and in future when we drop aufs.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-20 15:36:51 +00:00
Justin Cormack
f5b8d9a83e Always mount swap not just when created
Swap was not being mounted always.

See https://github.com/docker/for-win/issues/403

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-20 15:01:40 +00:00
Riyaz Faizullabhoy
5eefffd273 Upgrade to 4.9.5 and 4.4.44 kernels
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-20 15:00:49 +00:00
Justin Cormack
b059fd1e95 Merge pull request #1064 from justincormack/xen-it
More VM guest kernel options
2017-01-20 14:55:56 +00:00
Justin Cormack
e81ba98799 More VM guest kernel options
- comprehensive set of Xen options
- add balloon drivers elsewhere
- add other virtio drivers

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-20 13:57:42 +00:00
Justin Cormack
f266c2091f Merge pull request #1065 from justincormack/test-content-trust
Switch test to use alpine:3.5 while hub broken
2017-01-20 13:57:17 +00:00
Justin Cormack
7a3efdc588 Switch test to use alpine:3.5 while hub broken
There is a content trust issue with `alpine:latest` at present,
unblock the CI.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-20 12:34:44 +00:00
Riyaz Faizullabhoy
4d22046882 Merge pull request #1060 from justincormack/kernel-tar
Simplify extracting from kernel build
2017-01-19 18:51:40 +00:00
Justin Cormack
3cdd7f9964 Simplify extracting from kernel build
Makes build faster

Improve #691

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 17:20:18 +00:00
Justin Cormack
103531e2dc Merge pull request #1059 from justincormack/sysctl-remove
Remove sysctl and sysfs database overrides
2017-01-19 15:57:28 +00:00
Justin Cormack
0ed4af0950 Remove sysctl and sysfs database overrides
These never got an interface on any platform, and I don't think they
ever will, we can increase global limits or you can set something
with a privileged container. Can add back later if required.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 15:18:30 +00:00
Riyaz Faizullabhoy
dac622a89e Merge pull request #1058 from justincormack/windowsnet
Split out windowsnet into its own package directory
2017-01-19 15:18:10 +00:00
Justin Cormack
9ba1b27664 Split out windowsnet into its own package directory
This makes it easier to containerise and split per editions configs

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 15:02:26 +00:00
Justin Cormack
6b7996196e Merge pull request #1057 from justincormack/database-at-slash-database
Always have database at /Database
2017-01-19 14:52:27 +00:00
Justin Cormack
9b8e2989a3 Merge pull request #1056 from justincormack/tar2initup
Remove annoying output of dd
2017-01-19 14:50:58 +00:00
Justin Cormack
114a6971e0 Always have database at /Database
Use a bind mount for OSX and Windows for 9p filesystem.

This makes it easier to use a different database source,
and to share database into system containers.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 14:34:29 +00:00
Justin Cormack
7fabca00bb Remove annoying output of dd
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 14:28:48 +00:00
Riyaz Faizullabhoy
05370d3241 Merge pull request #1055 from riyazdf/gce-vsyscall-emulate
Set vsyscall=emulate for D4GCP
2017-01-19 14:28:14 +00:00
Riyaz Faizullabhoy
f904061463 vsyscall=emulate for D4GCP
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-19 13:55:25 +00:00
Riyaz Faizullabhoy
f483ed8814 Merge pull request #1054 from justincormack/ca-cert
Update ca-certificates to 20161130
2017-01-19 09:51:46 +00:00
Justin Cormack
bf2414cec3 Update ca-certificates to 20161130
In most places we use the Alpine one, which is already here, but
make sure this is updated, as we may use it more (yes, we should be
consistent).

Change the hash to just use the ca-cert hash, not the apt hash.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 09:15:54 +00:00
Justin Cormack
8328bcd3d9 Merge pull request #1039 from RobbKistler/hyperkit-test
Improve hyperkit/osx testing
2017-01-18 18:18:36 +00:00
Robb Kistler
d321479cdd Improve hyperkit/osx testing
Address #954:
- Pull hyperkit and vpnkit binaries from CI
- Use vpnkit instead of vmnet
- Add hyperkit-test test target

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-01-18 09:56:24 -08:00
Justin Cormack
59ef7609a6 Merge pull request #1047 from riyazdf/fs-protected-links
Add fs link protection sysctls
2017-01-18 17:28:17 +00:00
Justin Cormack
68761c88e6 Merge pull request #1052 from riyazdf/oom-adj-system-containers
Adjust OOM scores for system containers
2017-01-18 17:27:37 +00:00
Justin Cormack
ec5ddfcaad Merge pull request #1049 from justincormack/docker-1.13.0
Update Docker to 1.13.0
2017-01-18 17:27:13 +00:00
Riyaz Faizullabhoy
e6ca3465bf Adjust OOM scores for system containers
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-18 16:47:53 +00:00
Justin Cormack
64e36c0a78 Merge pull request #1048 from justincormack/aufs4.4-clean
Remove aufs4.4 reference from make media
2017-01-18 16:35:53 +00:00
Justin Cormack
36e5eb4fa1 Remove aufs4.4 reference from make media
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 16:28:43 +00:00
Justin Cormack
66348fda2a Update Docker to 1.13.0
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 16:14:17 +00:00
Riyaz Faizullabhoy
3cf8ac1c95 Add fs link protection sysctls
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-18 15:20:40 +00:00
Justin Cormack
d199d1aa07 Merge pull request #1044 from justincormack/no-aufs4.4
Remove aufs 4.4 support
2017-01-18 12:12:48 +00:00
Justin Cormack
90faac6097 Remove aufs 4.4 support
This only shipped for one rc and we are not going to ship it any more,
and CI is disabled.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 11:44:31 +00:00
Justin Cormack
82a3ef1166 Merge pull request #1038 from rneugeba/kern-up
kernel: add virtion_net csum fix and update patches to 4.9.4
2017-01-18 09:43:04 +00:00
Rolf Neugebauer
c3394ae3b3 kernel: add virtion_net csum fix and update patches to 4.9.4
Cherry-pick virtio_net csum fix and update patches based on:
https://github.com/rneugeba/linux-stable/tree/v4.9.4-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-17 21:25:58 +00:00
Justin Cormack
6c6e4c53c3 Merge pull request #1036 from justincormack/buildmode-pie
Use buildmode pie for Go code
2017-01-17 16:21:30 +00:00
Justin Cormack
7cf47d42f4 Use buildmode pie for Go code
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 16:03:50 +00:00
Justin Cormack
8f13802dbf Merge pull request #1037 from justincormack/qemu-alpine
Use Alpine for qemu-static
2017-01-17 16:01:26 +00:00
Justin Cormack
a1d0f31c7d Use Alpine for qemu-static
Static qemu-user is now available in Alpine edge. Includes the
patch for Golang crashing due to non standard signal usage.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 15:37:31 +00:00