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
Justin Cormack
a980cbac51
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
c59249b54d
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
07e339ed6b
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
6e4e281cf1
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
6a6f03db30
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
d4683bb112
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
e28a21e7a7
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
ddab0a9448
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
314c318685
Merge pull request #1030 from justincormack/build-containers
...
Build containerd containers from Docker containers
2017-01-17 13:24:58 +00:00
Justin Cormack
7ae11bc5d4
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
f8c8c13655
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
ae40576344
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
a1b6171677
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
6076d70996
Merge pull request #1023 from justincormack/go-compile-cleanup
...
Clean up go-compile
2017-01-15 20:48:45 +00:00
Justin Cormack
ab494d21e0
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
9d0ee1c32f
Merge pull request #1022 from justincormack/extra-riddler
...
Delete unnecessary file
2017-01-15 19:38:44 +00:00
Justin Cormack
a023b34367
Delete unnecessary file
...
Left behind after rework earlier.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 17:41:48 +00:00
Justin Cormack
d3abdc6252
Use docker run to compile C code not docker build
...
C version of #1006
Note that I switched all the C builds to use -O2 and that meant
that the compiler found some more warnings so I also fixed these
up. The possibly undefined ones were harmless, the aliasing one
is now more correct.
As these are small programs, the caching from `docker build` makes
no real difference, and worst case compile time is much better.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 15:55:14 +00:00
Justin Cormack
d054aba9c5
Merge pull request #1020 from justincormack/toybox-clean
...
Clean up build to not use alpine-build-c where not needed
2017-01-15 15:23:37 +00:00
Justin Cormack
04902fd1c8
Clean up build to not use alpine-build-c where not needed
...
Makes updates simpler.
Makes it explicit that `perf` currently requires Alpine 3.4, and update kernel version.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-15 14:07:46 +00:00
Justin Cormack
7fde35d381
Merge pull request #1019 from justincormack/alpine-go
...
Update to golang:1.7-alpine3.5 images
2017-01-15 11:32:00 +00:00
Justin Cormack
7fc2305a6f
Merge pull request #1018 from justincormack/proxy-cleanup
...
Remove unnecessary file from proxy
2017-01-15 11:31:40 +00:00
Justin Cormack
50215b9c6c
Update to golang:1.7-alpine3.5 images
...
Now there is an Alpine 3.5 variant of the Go 1.7 images, use this.
fix #972
Note updated the containers/binfmt image as this will be converted
to go-compile shortly, at which point alpine-build-go can be removed.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-14 09:41:12 +00:00
Justin Cormack
3dffd8861d
Remove unnecessary file from proxy
...
Was missed in cleanup in #1006
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-14 09:27:40 +00:00
Riyaz Faizullabhoy
72ef6dd2a1
Merge pull request #1016 from justincormack/kernel-test-quiet
...
Less verbose kernel config test
2017-01-13 16:46:32 -08:00
Justin Cormack
8585ddab9b
Less verbose kernel config test
...
As `grep` echoes the output, no need to have `set -x` on this script,
make output smaller and cleaner.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-14 00:09:50 +00:00
Justin Cormack
4735136343
Merge pull request #1014 from justincormack/dockerup
...
Update Docker to 1.13.0-rc7
2017-01-13 22:11:52 +00:00
Justin Cormack
8c1581bc39
Update Docker to 1.13.0-rc7
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-13 21:48:21 +00:00
Justin Cormack
4720fc2af7
Merge pull request #1006 from justincormack/go-compile
...
Compile Go code with docker run not docker build
2017-01-13 19:15:22 +00:00
Justin Cormack
38819dbd72
Merge pull request #1008 from justincormack/ocaml-hub
...
Build OCaml iptables package once and push to hub
2017-01-13 19:15:07 +00:00
Justin Cormack
45676c75b5
Merge pull request #1010 from justincormack/test-tidy
...
Tidy up test build
2017-01-13 19:14:55 +00:00
Justin Cormack
b9d7c221f3
Merge pull request #1011 from dsheets/fuse-fix-dcache-timeout
...
linux: patch fuse to fix a dcache timeout bug
2017-01-13 17:51:35 +00:00