Commit Graph

1986 Commits

Author SHA1 Message Date
Justin Cormack
f27c3ff5ed Move ebpf to its own directory
Unlike the other images in `base` this needs parts from the
Moby build so move it for now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-24 18:50:38 +00:00
Justin Cormack
b53e83d695 Merge pull request #1086 from justincormack/new-containerd
Shift to development track containerd
2017-01-24 17:50:45 +00:00
Justin Cormack
89e98eefa0 Shift to development track containerd
Move to the development track of `containerd` not the legacy 0.2
branch. The commands have changed a bit.

This does increase the image size as we are bundling the Docker
copy and our copy, and the new one is larger as it is growing features.
Hopefully Docker will shrink eventually. Also we may replace `ctr`
with a library.

Fix #1029

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-24 15:39:44 +00:00
Justin Cormack
c565c75a85 Merge pull request #1081 from riyazdf/panic
Do not reboot on panic, except for desktop editions
2017-01-24 12:09:20 +00:00
Justin Cormack
bb2da98169 Merge pull request #1080 from justincormack/split-database
Split config database setup by platform
2017-01-24 12:08:33 +00:00
Justin Cormack
d4416e1b93 Merge pull request #1084 from riyazdf/go-compile-lint
Merge lint.sh into compile.sh, remove unused alpine-build-go
2017-01-23 21:34:56 +00:00
Riyaz Faizullabhoy
4c810a27f9 Merge lint.sh into compile.sh, remove unused alpine-build-go
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-23 13:25:44 -08:00
Justin Cormack
eb388d9042 Merge pull request #1082 from RobbKistler/hyperkit-test-clean
Don't fail hyperkit-test after clean
2017-01-23 20:27:29 +00:00
Robb Kistler
5caa1838d9 Don't fail hyperkit-test after clean
Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-01-23 11:12:42 -08:00
Riyaz Faizullabhoy
c37e0c592f Set CONFIG_PANIC_TIMEOUT=0 in kernel config
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-23 10:58:58 -08:00
Riyaz Faizullabhoy
bb9a9f1050 Set panic=1 for docker 4 win
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-23 10:44:06 -08:00
Justin Cormack
321c180c60 Split config database setup by platform
Add basic database setup for AWS, GCP although these are not yet used
by the setup code but will be useful later.

Currently each is gated by `mobyplatform` but this can be removed once we
construct Moby per platform, and once these are containerised so they
are not run from `openrc`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-23 18:08:26 +00:00
Justin Cormack
4278e0d78e Merge pull request #1079 from justincormack/swapdiskname
Clean up swap partition mounting logic
2017-01-23 17:04:12 +00:00
Justin Cormack
aaa2e30a75 Merge pull request #1077 from djs55/benchmark-ipc
tap-vsockd: add buffering
2017-01-23 16:22:12 +00:00
Justin Cormack
df2c4818ed Clean up swap partition mounting logic
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-23 16:20:10 +00:00
David Scott
370a43de83 tap-vsockd: allocate payload separately for better alignment
Previously we allocated `sizeof(struct ring) + size`. This patch
allocates `sizeof(struct ring)` and then `size` for the payload
separately. Hopefully the payload will be better aligned.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-01-23 14:44:34 +00:00
Justin Cormack
097879fa92 Merge pull request #1078 from justincormack/aufs-patch
Add aufs patch for 4.9 to fix issue with extended attribute removal
2017-01-23 14:16:08 +00:00
Justin Cormack
79b7893679 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
3fc0d994b5 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
d128237d26 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
02bd52b5c1 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
5b718cd399 Merge pull request #1072 from rneugeba/patch-up
Update kernel patches
2017-01-20 17:51:24 +00:00
Riyaz Faizullabhoy
eb4c7cfbe9 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
e7575f88da 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
7f4d396ea6 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
58cf3b72d2 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
b5971f7684 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
2c604f1ef9 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
848ba2bb71 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
77689348d0 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
90506bf7d3 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
7d0b569a29 Merge pull request #1064 from justincormack/xen-it
More VM guest kernel options
2017-01-20 14:55:56 +00:00
Justin Cormack
27ce19f51a 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
53bbb8ac26 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
51ec80e84f 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
4c7bd926ce Merge pull request #1060 from justincormack/kernel-tar
Simplify extracting from kernel build
2017-01-19 18:51:40 +00:00
Justin Cormack
3aff6b503c 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
48754c2962 Merge pull request #1059 from justincormack/sysctl-remove
Remove sysctl and sysfs database overrides
2017-01-19 15:57:28 +00:00
Justin Cormack
e5656cc757 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
6b6eb0af8d 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
a0318c7f4c 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
adadab50bf 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
1521ae2dc5 Merge pull request #1056 from justincormack/tar2initup
Remove annoying output of dd
2017-01-19 14:50:58 +00:00
Justin Cormack
40a3b5578a 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
4638df2a9a Remove annoying output of dd
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-19 14:28:48 +00:00
Riyaz Faizullabhoy
24a2cb5096 Merge pull request #1055 from riyazdf/gce-vsyscall-emulate
Set vsyscall=emulate for D4GCP
2017-01-19 14:28:14 +00:00
Riyaz Faizullabhoy
f4b18b3b4e vsyscall=emulate for D4GCP
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-19 13:55:25 +00:00
Riyaz Faizullabhoy
14aeaf0fb5 Merge pull request #1054 from justincormack/ca-cert
Update ca-certificates to 20161130
2017-01-19 09:51:46 +00:00
Justin Cormack
7082a3161e 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
5f29f59618 Merge pull request #1039 from RobbKistler/hyperkit-test
Improve hyperkit/osx testing
2017-01-18 18:18:36 +00:00