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
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
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
Robb Kistler
29e3d74c2a
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
1f860228d7
Merge pull request #1047 from riyazdf/fs-protected-links
...
Add fs link protection sysctls
2017-01-18 17:28:17 +00:00
Justin Cormack
f4774d317d
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
eb21eab61f
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
a2b3d84668
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
31e898f728
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
e579b09a5c
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
36df13e1ef
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
b919d6483b
Add fs link protection sysctls
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-18 15:20:40 +00:00
Justin Cormack
fdbc4ab609
Merge pull request #1044 from justincormack/no-aufs4.4
...
Remove aufs 4.4 support
2017-01-18 12:12:48 +00:00
Justin Cormack
99648a82d1
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
8498a98153
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
d9dd60668d
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
d2b99ffdd6
Merge pull request #1036 from justincormack/buildmode-pie
...
Use buildmode pie for Go code
2017-01-17 16:21:30 +00:00
Justin Cormack
74d3bce70e
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
ce2d21d79e
Merge pull request #1037 from justincormack/qemu-alpine
...
Use Alpine for qemu-static
2017-01-17 16:01:26 +00:00
Justin Cormack
7d071f52b1
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
Justin Cormack
a16ec91ca3
Merge pull request #1035 from justincormack/no-aufs4.4
...
Do not build aufs4.4 branch
2017-01-17 15:21:33 +00:00
Justin Cormack
a3991d2885
Merge pull request #1033 from justincormack/untar-hashes
...
Do not use tar to make hashes
2017-01-17 15:21:23 +00:00
Justin Cormack
c7ee4ea5e7
Merge pull request #1034 from justincormack/test-container
...
Build test container from a Docker container
2017-01-17 14:57:03 +00:00
Justin Cormack
8f03ea4753
Do not build aufs4.4 branch
...
Not being used and we will delete code for this soon, after 1.13 ships.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 14:31:52 +00:00
Justin Cormack
0bd7f620ff
Do not use tar to make hashes
...
As it includes timestanps in the tarball it does not make a stable
hash; use contents of the files instead.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 14:28:23 +00:00
Justin Cormack
975b598089
Merge pull request #1032 from justincormack/sha-hash
...
Use hash for sha image, otherwise requires network access for build
2017-01-17 14:25:52 +00:00
Justin Cormack
640afbbe33
Build test container from a Docker container
...
Corresponds to #1030 but for test container
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 14:24:57 +00:00
Justin Cormack
0e6d7d150f
Use hash for sha image, otherwise requires network access for build
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 13:36:09 +00:00
Justin Cormack
7f2ebae2c3
Merge pull request #1030 from justincormack/build-containers
...
Build containerd containers from Docker containers
2017-01-17 13:24:58 +00:00
Justin Cormack
e2b4bacfd6
Build containerd containers from Docker containers
...
Simplifies the build process, and makes testing easier as there is a
Docker container you can run to test things.
Replaces #994
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 12:29:55 +00:00
Riyaz Faizullabhoy
56d5a5a711
Merge pull request #1021 from justincormack/c-compile
...
Use docker run to compile C code not docker build
2017-01-16 17:44:47 +00:00
Riyaz Faizullabhoy
a582bc0a90
Merge pull request #1027 from riyazdf/kernel-bump
...
Update to 4.9.4 and 4.4.43
2017-01-16 17:44:35 +00:00
Riyaz Faizullabhoy
5865612b93
Update to 4.9.4 and 4.4.43
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-16 16:59:31 +00:00
Justin Cormack
d3fcfb7ed7
Merge pull request #1023 from justincormack/go-compile-cleanup
...
Clean up go-compile
2017-01-15 20:48:45 +00:00
Justin Cormack
6a315fab59
Clean up go-compile
...
- remove unused `--docker` option
- neater output for stages of check, build
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 19:43:03 +00:00
Justin Cormack
30b0d4d6b5
Merge pull request #1022 from justincormack/extra-riddler
...
Delete unnecessary file
2017-01-15 19:38:44 +00:00