Commit Graph

2019 Commits

Author SHA1 Message Date
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
Nathan LeClaire
4b3192df62 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
d8fd61861b 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
24e432d9cb 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
e1026a1f95 Change system container label
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-10 13:29:47 -08:00
Justin Cormack
0135592a41 Merge pull request #984 from dgageot/gcp-fixes
Fixes fo GCP
2017-01-10 20:11:46 +00:00
David Gageot
13cc81a1aa [GCP] Configure diagnostics server
Signed-off-by: David Gageot <david@gageot.net>
2017-01-10 19:58:34 +01:00
David Gageot
9b156d0cd4 [GCP] Remove useless stop()
Signed-off-by: David Gageot <david@gageot.net>
2017-01-10 19:58:33 +01:00
David Gageot
a9fe30b2b7 [GCP] Configure ntp server
Signed-off-by: David Gageot <david@gageot.net>
2017-01-10 19:58:31 +01:00
Nathan LeClaire
1ca9096f55 Fix streaming API request error
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-10 10:48:02 -08:00
Riyaz Faizullabhoy
d162d5ec53 Merge pull request #983 from justincormack/no-latest
Remove some pushes to :latest
2017-01-10 09:52:55 -08:00
Justin Cormack
0f73fd6e68 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
69468bf42f 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
495dcf63c5 Merge pull request #980 from justincormack/sysctl-rational
Combine sysctl configs
2017-01-10 16:08:15 +00:00
Justin Cormack
00d7656a29 Merge pull request #981 from justincormack/bpfup
Update bcc
2017-01-10 15:20:57 +00:00
Justin Cormack
18145b3401 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
fa62544f14 Merge pull request #975 from nathanleclaire/fix_daemon_avail_check
Fix daemon availability check
2017-01-10 11:42:30 +00:00
Justin Cormack
d7508166bf 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
da59746ec6 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
7237360e44 Merge pull request #974 from nathanleclaire/check_req
Check request type
2017-01-09 19:42:14 +00:00
Justin Cormack
392252bc48 Merge pull request #976 from nathanleclaire/create_docker_var_home
Create docker var home
2017-01-09 19:41:44 +00:00
Nathan LeClaire
e26443cab9 Create and chown persistent homedir
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 11:15:46 -08:00
Nathan LeClaire
2887824529 Check request type in /diagnose
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 11:13:40 -08:00
Justin Cormack
b726dfa812 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
814a351e93 Fix faulty daemon availability check
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-09 10:27:13 -08:00
Nathan LeClaire
1fdab8a8e2 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
7ac8256416 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
473ef04bd9 Merge pull request #969 from justincormack/base-build-deps
Simplify base images
2017-01-09 17:48:00 +00:00
Justin Cormack
6dd6a8d48f Merge pull request #970 from justincormack/kernelup
Update to Linux 4.9.2
2017-01-09 17:14:11 +00:00
Justin Cormack
e2aead6675 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
b0285f7c84 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
09400a2085 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
4495664a4f 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
431a60746d Merge pull request #964 from rneugeba/ebpf
Fix a few eBPF things
2017-01-06 19:03:16 +00:00
Justin Cormack
12f17b605f 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
804f35c1b3 Merge pull request #962 from justincormack/kernelup
Update kernel to 4.9.1
2017-01-06 18:22:22 +00:00
Rolf Neugebauer
be37d7b0fa 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
2685c8cd0c 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
c750418200 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
b23c7107b5 Merge pull request #959 from justincormack/ci-config
Add datakit CI control file
2017-01-06 17:49:15 +00:00
Rolf Neugebauer
fe533386f0 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
8ed1408b19 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
b56da24f6a 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