Commit Graph

2141 Commits

Author SHA1 Message Date
Justin Cormack
c1449d4e35 Merge pull request #1205 from justincormack/docker-17.03-rc
Update Docker to 17.03.0-ce-rc1
2017-02-20 11:48:54 +00:00
Justin Cormack
457c173849 Update Docker to 17.03.0-ce-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-20 10:52:41 +00:00
Riyaz Faizullabhoy
e1eab7ca4f Merge pull request #1203 from justincormack/kernel-make-clean
Clean up kernel Makefile so it has no repetition
2017-02-17 11:10:21 -08:00
Justin Cormack
c6cfa0e4d3 Clean up kernel Makefile so it has no repetition
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 17:43:35 +00:00
Riyaz Faizullabhoy
447ee3b6c0 Merge pull request #1202 from justincormack/go-up
Update to Go 1.8
2017-02-17 09:19:53 -08:00
Riyaz Faizullabhoy
c643f19434 Merge pull request #1197 from justincormack/testup
Update kernel config tests
2017-02-17 09:19:44 -08:00
Justin Cormack
fe64819020 Update to Go 1.8
This includes most things except the containerd and runc builds
which I will do next time I update them.

Note that all golang:alpine images now for 1.8 are ALpine 3.5 based.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 16:31:19 +00:00
Justin Cormack
74111017f6 Merge pull request #1201 from justincormack/newtools
Add new minimal init prototype and new tools
2017-02-17 15:56:42 +00:00
Justin Cormack
d29be01b0d Add new minimal init prototype and new tools
This is part of the new moby tool work to get a minimal system
up that can be expanded.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 15:31:00 +00:00
Justin Cormack
844c1c39df Update kernel config tests
- `CONFIG_BUG_ON_DATA_CORRUPTION` is a 4.10 kernel only flag, so gate this.
- some config was duplicated on gated and normal config
- some 4.4 issues with the new config

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 14:52:32 +00:00
Justin Cormack
295f352bf2 Merge pull request #1199 from ijc25/cpuacct-online-offline
Revert "sched/cpuacct: Show all possible CPUs in cpuacct output" in 4.9 kernel
2017-02-17 13:43:15 +00:00
Ian Campbell
31cf45bfc3 Revert "sched/cpuacct: Show all possible CPUs in cpuacct output" in 4.9 kernel
This change (5ca3726 added in v4.7-rc1) exposed issues described in
https://github.com/docker/docker/issues/28941, since we don't support CPU
hotplug anyway revert the change while we decide on a proper fix.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-02-17 13:19:18 +00:00
Justin Cormack
85613b5431 Merge pull request #1193 from justincormack/kernelup
Update Linux 4.4 to 4.4.49
2017-02-16 09:40:30 +00:00
Justin Cormack
bece837dec Merge pull request #1190 from justincormack/iburst
Stop using dhcp ntp and fix the options used on OSX
2017-02-16 08:50:31 +00:00
Justin Cormack
10df2f9857 Merge pull request #1192 from RobbKistler/1139-fix-disk-race
Re-run `mdev -s` if /dev/sda1 isn't populated
2017-02-16 08:49:49 +00:00
Justin Cormack
0b5cad4f14 Update Linux 4.4 to 4.4.49
Security update, low importance.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-16 08:47:52 +00:00
Robb Kistler
56059aba3b Re-run mdev -s if /dev/sda1 isn't populated
Fixes #1139

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-02-15 17:47:38 -08:00
Justin Cormack
084291469c Stop using dhcp ntp and fix the options used on OSX
The options added in de6e7f9cbe
were not applied for ntp configured servers.

As the address is always the same, stop using dhcp and just hard code this.
This should make sync work how it used to, ie quite well.

Also trust the GCP ntp server, as it is local and provided by infrastructure.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-15 17:54:41 +00:00
Rolf Neugebauer
23306101cb Merge pull request #1189 from rneugeba/kern-up
kernel: Update to 4.9.10
2017-02-15 17:50:10 +00:00
Rolf Neugebauer
6396ecdeee kernel: Update to 4.9.10
4.9.10 included several of the VMBus patches we no longer
need to carry.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-15 16:50:31 +00:00
Justin Cormack
d17e5f69a2 Merge pull request #1187 from justincormack/pool
Use ntp pool not single server for AWS
2017-02-14 17:50:06 +00:00
Justin Cormack
97b5b71224 Use ntp pool not single server for AWS
Some of the servers are off by a lot, eg 7s in one case I saw.

SHould help with #1186

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-14 13:20:18 +00:00
Justin Cormack
304fb1bc27 Merge pull request #1175 from riyazdf/kern-config-hardening
Kernel config hardening
2017-02-13 20:09:55 +00:00
Riyaz Faizullabhoy
4daa3b5c88 Bump kernel config test and revert IA32_EMULATION
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-13 11:38:14 -08:00
Riyaz Faizullabhoy
25b2d47f1d Add page_poison=1 to boot args
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-13 10:16:46 -08:00
Justin Cormack
66c92081fc Update kernel config check for suggested values
This should be done with #1175

Config not updated as may still need changes

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 10:14:53 -08:00
Riyaz Faizullabhoy
87b4688923 Harden kernel config with page poisoning, randomized mem, disabling ia32 and ldt syscall modification
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-13 10:13:48 -08:00
Riyaz Faizullabhoy
331719f098 Bump kernel config to 4.9.8
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-13 10:13:48 -08:00
Riyaz Faizullabhoy
54d4481962 Merge pull request #1185 from justincormack/build-kernel
alpine-build-c is only used for kernel builds so rename
2017-02-13 09:56:36 -08:00
Justin Cormack
e25ee0b142 alpine-build-c is only used for kernel builds so rename
Also remove some unecessary packages.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 16:59:38 +00:00
Justin Cormack
a22f2be05a Merge pull request #1183 from justincormack/makedockerfile
Generate media Dockerfile
2017-02-13 14:54:01 +00:00
Justin Cormack
0b2251212a Generate media Dockerfile
It is trivial no need to have committed in repo.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 14:01:32 +00:00
Justin Cormack
895f946755 Merge pull request #1182 from justincormack/mM
dd unit size is very non standard, just use numbers
2017-02-13 13:37:11 +00:00
Justin Cormack
6aab136adc dd unit size is very non standard, just use numbers
On OSX the system version uses `m` but `brew` will install a version
that only understands `M`...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 11:50:07 +00:00
Justin Cormack
c13faaba29 Merge pull request #1180 from justincormack/kernelup
Update kernel to 4.9.9, 4.4.48
2017-02-13 11:47:34 +00:00
Justin Cormack
0a43565d9a Merge pull request #1124 from riyazdf/apk-audit
Use apk audit to check system binaries
2017-02-13 11:41:14 +00:00
Justin Cormack
726bfc5806 Merge pull request #1179 from justincormack/mv-conttainers
Move containers directory to alpine directory
2017-02-13 11:38:41 +00:00
Justin Cormack
dc8b41eb3f Update kernel to 4.9.9, 4.4.48
Security update, severity low.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 11:13:34 +00:00
Justin Cormack
53399b98be Move containers directory to alpine directory
Not using this with new tool, so leave for editions.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 11:10:13 +00:00
Riyaz Faizullabhoy
1d548cfa1a Merge pull request #1173 from nathanleclaire/azure_bump_vhd
Bump Azure digest and version for 1.13.1
2017-02-09 16:24:02 -08:00
Nathan LeClaire
578f40ac47 Bump Azure digest and version for 1.13.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-02-09 15:59:25 -08:00
Nathan LeClaire
a067dfe6d3 Merge pull request #1169 from nathanleclaire/system_con_fix
Fix system container bug
2017-02-09 15:38:16 -08:00
Nathan LeClaire
09746e4860 Merge pull request #1171 from justincormack/metrics-proxy-fix
Do not try to run metrics proxy when not configured
2017-02-09 13:21:50 -08:00
Justin Cormack
2234196966 Merge pull request #1172 from justincormack/fix-osx-script
Fix OSX script for directory moves
2017-02-09 15:36:37 +00:00
Justin Cormack
bf88aa69d2 Fix OSX script for directory moves
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-09 13:59:16 +00:00
Justin Cormack
155676ee21 Do not try to run metrics proxy when not configured
Failure test case was not correct; printed a (harmless) error message
that was confusing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-09 13:58:03 +00:00
Nathan LeClaire
7459a4bfad Fix system container bug
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-02-08 17:02:14 -08:00
Justin Cormack
62794285aa Merge pull request #1168 from rneugeba/doc
docs: add short how-to for running Moby on GCP
2017-02-08 20:44:11 +00:00
Rolf Neugebauer
c1c30b62ff docs: add short how-to for running Moby on GCP
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-08 17:35:05 +00:00
Justin Cormack
e66a558a59 Merge pull request #1166 from justincormack/dockerup
Update Docker to 1.13.1
2017-02-08 09:53:07 +00:00