Commit Graph

1346 Commits

Author SHA1 Message Date
Justin Cormack
cb44fd12cd Merge pull request #987 from justincormack/reinstate-4.4
Reinstate 4.4 support
2017-01-12 11:18:14 +00:00
Justin Cormack
c73d6f1721 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
Rolf Neugebauer
aa885f3bb3 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
f419265794 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
ea612505f6 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
4996ec700c 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
3358f57891 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
Justin Cormack
c4fd3fce44 Merge pull request #985 from justincormack/riddler-config
Use riddler to generate config.json
2017-01-10 23:32:57 +00:00
Nathan LeClaire
412d7693a3 Add label to Azure agent container
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-10 15:08:52 -08:00
Justin Cormack
0b31c9dc42 Merge pull request #978 from nathanleclaire/collect_system_logs
Collect system container logs for diagnostics
2017-01-10 22:23:50 +00:00
Justin Cormack
6e82b2ad54 Use riddler to generate config.json
- use jq to fix up the output where there are still issues
- some issues will need fixing up in future too
- can remove fixes later
- still plan to restructure the code around containers to make it easier and clearer

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-10 22:03:13 +00:00
Nathan LeClaire
9c6367de50 Change system container label
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-10 13:29:47 -08:00
David Gageot
214bce6c1d [GCP] Configure diagnostics server
Signed-off-by: David Gageot <david@gageot.net>
2017-01-10 19:58:34 +01:00
David Gageot
da6c2d945d [GCP] Remove useless stop()
Signed-off-by: David Gageot <david@gageot.net>
2017-01-10 19:58:33 +01:00
David Gageot
a3b842d443 [GCP] Configure ntp server
Signed-off-by: David Gageot <david@gageot.net>
2017-01-10 19:58:31 +01:00
Nathan LeClaire
b88b78e982 Fix streaming API request error
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-10 10:48:02 -08:00
Justin Cormack
d316fa9597 Remove some pushes to :latest
Missed these before, noticed while making a new one.

Also a copy paste error left one shasum incorrect.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-10 17:34:24 +00:00
Nathan LeClaire
7b61a27c69 Begin adding system container log support to diagnostics
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-10 08:37:37 -08:00
Justin Cormack
673fbda634 Merge pull request #980 from justincormack/sysctl-rational
Combine sysctl configs
2017-01-10 16:08:15 +00:00
Justin Cormack
3a93ad8013 Update bcc
- remove patch now https://github.com/iovisor/bcc/pull/887 is merged
- move the patches to the base image as it makes more sense like this

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-10 13:33:00 +00:00
Justin Cormack
f0ad69e24a Merge pull request #975 from nathanleclaire/fix_daemon_avail_check
Fix daemon availability check
2017-01-10 11:42:30 +00:00
Justin Cormack
83a9cf6622 Combine sysctl configs
Where the suggestions came from is not that useful, just have a
single file for the main ones and then distro specific versions.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-10 11:40:36 +00:00
Nathan LeClaire
6c0a8ff42c Move daemon ping to use native Go code
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 16:25:15 -08:00
Justin Cormack
2d2b5ae86c Merge pull request #974 from nathanleclaire/check_req
Check request type
2017-01-09 19:42:14 +00:00
Nathan LeClaire
dc64dd5316 Create and chown persistent homedir
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 11:15:46 -08:00
Nathan LeClaire
50ea998400 Check request type in /diagnose
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 11:13:40 -08:00
Nathan LeClaire
1a5347804e Fix faulty daemon availability check
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 10:27:13 -08:00
Nathan LeClaire
2578bf5476 Bump version/digest for 1.13.0-rc5
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 10:17:12 -08:00
Nathan LeClaire
7cc888b810 Add provisions to enable proper restart in Azure
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 10:10:39 -08:00
Justin Cormack
fb1e7dbc63 Merge pull request #969 from justincormack/base-build-deps
Simplify base images
2017-01-09 17:48:00 +00:00
Justin Cormack
4fc616491a Update to Linux 4.9.2
- security update, priority low.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-09 15:59:04 +00:00
Justin Cormack
05618deeb4 Simplify base images
Some of the builds do not need to depend on docker-build-c, makes
update a bit simpler.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-09 15:37:54 +00:00
Justin Cormack
235cb9312a Update opam to current alpine 3.5 base
Use internal solver as external one is broken at present.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-07 00:36:16 +00:00
Justin Cormack
27cbd17613 Merge pull request #964 from rneugeba/ebpf
Fix a few eBPF things
2017-01-06 19:03:16 +00:00
Justin Cormack
c77fabb9da Merge pull request #960 from justincormack/no-kernel-workdir
Do not set WORKDIR in kernel builds
2017-01-06 18:29:46 +00:00
Rolf Neugebauer
3a9009a6e7 ebpf: fix ebpf compile error
Some/most of the samples/tools throw and error, e.g.:
LLVM ERROR: Cannot select: 0x56049b79dcb0: ch,glue = BPFISD::CALL 0x56049a93ad60, TargetExternalSymbol:i64'__stack_chk_fail'
  0x56049b391500: i64 = TargetExternalSymbol'__stack_chk_fail'
  In function: waker

bcc-stack-protector.patch adds -fno-stack-protector to the CFLAGS
which fixes this error.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-06 18:06:05 +00:00
Justin Cormack
1a13a90f16 Do not set WORKDIR in kernel builds
This is a temporary workaround for https://github.com/docker/docker/issues/29950
which has broken caching and therefore is very annoying for development, but we
don't really need to set it, so it can stay...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-06 18:03:09 +00:00
Justin Cormack
6dd377145d Update kernel to 4.9.1
This has various security updates which do potentially affect
containerised application security see
https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.9.1

estimated medium severity.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-06 18:02:06 +00:00
Rolf Neugebauer
fa1a55ae03 ebpf: set LD_LIBRARY_PATH in container
This is needed for the python tools to find libbcc.so

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-06 16:49:38 +00:00
Justin Cormack
c842247bac Merge pull request #952 from justincormack/mtu-dhcpcd
Add the MTU script for dhcpcd
2017-01-06 10:27:16 +00:00
Justin Cormack
973b0bf19d Add the MTU script for dhcpcd
This might fix the issue that GCE is not setting the MTU from
the DHCP response. The documentation says this is shipped but
it is not in Alpine, this one is from a NetBSD install.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-05 23:24:42 +00:00
Justin Cormack
e1a3ae1a46 Merge pull request #927 from riyazdf/ubsan-config
kernel config updates for undefined behavior
2017-01-05 20:04:05 +00:00
Riyaz Faizullabhoy
97040931c3 Set CONFIG_UBSAN, add to grep test
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-05 09:03:21 -08:00
Justin Cormack
5a06152f98 Update Go build packages to Alpine 3.5
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-05 15:58:16 +00:00
Justin Cormack
0f018a4f20 Merge pull request #945 from justincormack/ebpf-container
Add a development eBPF container build
2017-01-05 15:07:14 +00:00
Justin Cormack
ee7f24defd Add a development eBPF container build
See `docs/ebpf.md` for how to use. This is built by CI or you can build
manually if you customise the kernel.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-05 11:59:28 +00:00
Justin Cormack
16b941fb68 Update docker to 1.13.0-rc5
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-05 09:28:02 +00:00
Justin Cormack
83f5195b69 Merge pull request #938 from riyazdf/grep-test
grep test for kernel config
2017-01-04 18:28:38 +00:00
Riyaz Faizullabhoy
bcebb47868 Kernel config grep test
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-04 09:44:17 -08:00
David Gageot
d36d9b5c1b Ignore non existant startup script (http/404)
Signed-off-by: David Gageot <david@gageot.net>
2017-01-04 17:59:08 +01:00