Commit Graph

2032 Commits

Author SHA1 Message Date
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
Riyaz Faizullabhoy
0603cc2b94 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
c4fd3fce44 Merge pull request #985 from justincormack/riddler-config
Use riddler to generate config.json
2017-01-10 23:32:57 +00:00
Justin Cormack
2f121d24b8 Merge pull request #986 from nathanleclaire/label_azure_agent
Label azure agent
2017-01-10 23:32:38 +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
Justin Cormack
769a34bf7c Merge pull request #984 from dgageot/gcp-fixes
Fixes fo GCP
2017-01-10 20:11:46 +00: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
Riyaz Faizullabhoy
7eba1eae58 Merge pull request #983 from justincormack/no-latest
Remove some pushes to :latest
2017-01-10 09:52:55 -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
7597942e9c Merge pull request #981 from justincormack/bpfup
Update bcc
2017-01-10 15:20:57 +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
Justin Cormack
b4780446a2 Merge pull request #976 from nathanleclaire/create_docker_var_home
Create docker var home
2017-01-09 19:41:44 +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
Justin Cormack
64eaee5210 Merge pull request #973 from nathanleclaire/creat_var_persist_dir
Add provisions to enable proper restart in Azure
2017-01-09 18:49:26 +00: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
acf87e4101 Merge pull request #970 from justincormack/kernelup
Update to Linux 4.9.2
2017-01-09 17:14:11 +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
6b78c88e8b Merge pull request #968 from justincormack/opamup
Update opam to current alpine 3.5 base
2017-01-07 00:53:17 +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
Justin Cormack
7f41abd229 Merge pull request #962 from justincormack/kernelup
Update kernel to 4.9.1
2017-01-06 18:22:22 +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
Justin Cormack
3258ea6017 Merge pull request #959 from justincormack/ci-config
Add datakit CI control file
2017-01-06 17:49:15 +00:00
Rolf Neugebauer
48d9722ac0 docs: add a note about kernel symbols to the ebpf documentation
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-06 16:52:16 +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
Rolf Neugebauer
9d90fbf503 docs: add --pid=host to ebpf command line.
A lot of the `iovisor/bcc` tools take a pid as a command line option and using
`--pid=host` allows you to use `$(pgrep foo)`

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-06 16:43:43 +00:00
Justin Cormack
285266dd93 Add datakit CI control file
This controls build with AUFS=1 so we can build in parallel.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-06 15:10:05 +00:00