Commit Graph

2011 Commits

Author SHA1 Message Date
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
Justin Cormack
1866083fb8 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
b5d9ff8cda 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
c074790a28 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
421afc5000 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
d6f8152d1a 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
a2dbd803c6 Merge pull request #1018 from justincormack/proxy-cleanup
Remove unnecessary file from proxy
2017-01-15 11:31:40 +00:00
Justin Cormack
5cfb149637 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
be6ab94db4 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
6f07ca1a8f Merge pull request #1016 from justincormack/kernel-test-quiet
Less verbose kernel config test
2017-01-13 16:46:32 -08:00
Justin Cormack
ce281442d1 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
fe250cf775 Merge pull request #1014 from justincormack/dockerup
Update Docker to 1.13.0-rc7
2017-01-13 22:11:52 +00:00
Justin Cormack
7982de1545 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
d2655a92f1 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
c8562d29ec 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
6a763b7ecb Merge pull request #1010 from justincormack/test-tidy
Tidy up test build
2017-01-13 19:14:55 +00:00
Justin Cormack
a3723b5b3f 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
Riyaz Faizullabhoy
25e42f6c87 Merge pull request #1005 from justincormack/makedep
Fix Makefile deps
2017-01-13 09:17:25 -08:00
Justin Cormack
382c9f8a90 Tidy up test build
Do not build from Go image as not clear we will switch it.

Print some output at the end for a quick visual success indicator.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-13 17:03:05 +00:00
Justin Cormack
36550acf83 Merge pull request #991 from riyazdf/test-container-riddler
Use riddler to generate containerd configuration for test container
2017-01-13 17:01:03 +00:00
David Sheets
b85c64e047 linux: patch fuse to fix a dcache timeout bug
Introduced in torvalds/linux@bcb6f6d2b9 to
check that nsec values are sane, a max was used where a min should have
been.

Fixes #923.

Signed-off-by: David Sheets <dsheets@docker.com>
2017-01-13 16:59:36 +00:00
Justin Cormack
06598ae9bf Build OCaml iptables package once and push to hub
As the build requires networking, is non repeatable as dependencies
may change, makes sense to make it a static package for now.

Plan is to rewrite in Go anyway at some point see #467

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-13 16:36:03 +00:00
Justin Cormack
b184b3f0e1 Compile Go code with docker run not docker build
Go code is really fast to compile so we do not really need to use the
cache features of `docker build`. So make a compile container instead.
This can also output a build context and Dockerfile if you want to do
a build.

For reference, an uncached `docker build` of our Go code takes about
7s, a cached one 1.2s, and this takes 1.7s, so the best case is a little
worse, but we save a lot of images, and the worst case is better.

This is mainly designed to make the nested builds for containerd
containers simpler too. Will add a variant for the C code as well.

Also add `-static` to the flags so we always make static executables,
which was omitted previously.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-13 15:49:51 +00:00
Justin Cormack
dae19ed847 Fix Makefile deps
Just noticed this while copying it for another build.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-13 13:16:32 +00:00
Justin Cormack
4615aa7a45 Merge pull request #1004 from justincormack/kernelup
Update to Linux 4.9.3 and 4.4.42
2017-01-12 21:44:23 +00:00
Justin Cormack
e35277b9bb Update to Linux 4.9.3 and 4.4.42
- security update, severity low.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 20:08:10 +00:00
Justin Cormack
3ef65e50f2 Merge pull request #1001 from justincormack/get-robust
make get compatibility with older builds
2017-01-12 15:04:30 +00:00
Justin Cormack
0a1ffd9203 make get compatibility with older builds
Old builds did not have kernel headers or kernel dev headers, so do not fail

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 14:35:44 +00:00
Justin Cormack
262fb03750 Merge pull request #987 from justincormack/reinstate-4.4
Reinstate 4.4 support
2017-01-12 11:18:14 +00:00
Justin Cormack
33aab21911 Merge pull request #999 from justincormack/get-tags
Add prefix for make get
2017-01-12 11:17:12 +00:00
Justin Cormack
b0c67f3c9a Update README with kernel variants
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 10:04:13 +00:00
Justin Cormack
3fbd615f9a Add an LTS 4.4 kernel
This is the same as aufs variant, but without AUFS patches. Looks like
GCP may need this, at least initially.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 09:47:32 +00:00
Justin Cormack
a4c545b87c Add prefix for make get
Allows `make AUFS=1 get` to pull the aufs build binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-12 09:14:01 +00:00
Justin Cormack
ad3386aacf Merge pull request #998 from rneugeba/timesynch
kernel: update kernel patches
2017-01-12 09:08:07 +00:00
Rolf Neugebauer
d61af2ee04 kernel: update kernel patches
On older Windows builds (e.g. 10586) the 4.9.x TimeSync integration
service spams the logs with multiple messages a second of the form:
hv_utils: Using TimeSync version 4.0

It seems that a new protocol version was introduced with newer
Windows 10 builds but the kernel patches don't negotiate the
protocol version based on what the host supports, but instead
simply use the Windows version of the host.

Added two new patches:
- the first one is a cherry-pick from upstream which fixes some
  of the TimeSync protocol negotiation, but does not fix the issue.
- the second one forces the TimeSync protocol to version 3.0 even on
  Windows 10 hosts.

Patches based on: https://github.com/rneugeba/linux-stable/tree/v4.9.2-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-12 00:14:23 +00:00
Justin Cormack
bae6bd3944 Merge pull request #996 from justincormack/dockerup
Update Docker engine to 1.13.0-rc6
2017-01-11 22:42:15 +00:00
Justin Cormack
41fabe9e1a Update Docker engine to 1.13.0-rc6
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-11 22:26:22 +00:00
Justin Cormack
27c5b9ee9e Adjust kernel config tests to support 4.4
- some options are different

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-11 17:35:25 +00:00
Justin Cormack
3bc7060843 Backport transparent binfmt_misc to 4.4
As we released this in the beta channel, and it is a nice feature that our users love,
backporting this to 4.4 so we don't have to revert it or conditionally behave differently.

This is upstream Linux commits
- 9a08c352d05305ca7651540c3b107da1e4e1f40b fs: add filp_clone_open API
- 948b701a607f123df92ed29084413e5dd8cda2ed binfmt_misc: add persistent opened binary handler for containers

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-11 16:09:37 +00:00
Justin Cormack
26e24a760a Reinstate Linux 4.4 LTS series support
- Add back Linux kernel 4.4.x support, only for AUFS at present.
- Add back config options that are different for 4.4 series

See #923 for discussion on whether we need to do this.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-11 16:08:14 +00:00
Riyaz Faizullabhoy
9520e00441 Use riddler to generate containerd configuration for test container
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-10 22:08:03 -08:00
Justin Cormack
19798c5468 Merge pull request #985 from justincormack/riddler-config
Use riddler to generate config.json
2017-01-10 23:32:57 +00:00
Justin Cormack
e916c7cad9 Merge pull request #986 from nathanleclaire/label_azure_agent
Label azure agent
2017-01-10 23:32:38 +00:00