Commit Graph

2443 Commits

Author SHA1 Message Date
Justin Cormack
0bb61ead06 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
b18c907384 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
cfff8cdfc6 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
10e63b176a 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
b4d18d867e 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
9d64a6dea2 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
659949aba5 Merge pull request #1189 from rneugeba/kern-up
kernel: Update to 4.9.10
2017-02-15 17:50:10 +00:00
Rolf Neugebauer
49ceee18d7 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
a50e3bac9e 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
fd6169b607 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
dd5f82d81d Merge pull request #1175 from riyazdf/kern-config-hardening
Kernel config hardening
2017-02-13 20:09:55 +00:00
Riyaz Faizullabhoy
5a5c58c29f 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
7036d3d676 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
24c029ab8a 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
8fdc58e867 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
c77b192a39 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
24f799284a 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
5112209050 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
f8b9418c6c Merge pull request #1183 from justincormack/makedockerfile
Generate media Dockerfile
2017-02-13 14:54:01 +00:00
Justin Cormack
70a5f68cb2 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
e5be47c000 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
ed12fe5823 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
346550b196 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
728978cf93 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
d83397cfd0 Merge pull request #1179 from justincormack/mv-conttainers
Move containers directory to alpine directory
2017-02-13 11:38:41 +00:00
Justin Cormack
734fb236c3 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
3b26b76875 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
44e6801ec9 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
34b29f52af 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
f438d42987 Merge pull request #1169 from nathanleclaire/system_con_fix
Fix system container bug
2017-02-09 15:38:16 -08:00
Nathan LeClaire
0b7beced18 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
845f76c5f5 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
98ff54a3e5 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
f290333c48 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
0ecaed9d0b Fix system container bug
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-02-08 17:02:14 -08:00
Justin Cormack
f853482730 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
35bc19213c 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
056b8ba787 Merge pull request #1166 from justincormack/dockerup
Update Docker to 1.13.1
2017-02-08 09:53:07 +00:00
Justin Cormack
533a8d48fe Update Docker to 1.13.1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-08 09:34:57 +00:00
Riyaz Faizullabhoy
fc6917ca65 Merge pull request #1144 from riyazdf/1.13.1-rc2-bump
1.13.1-rc2 docker bump
2017-02-06 21:50:35 -08:00
Justin Cormack
f3542006c6 Merge pull request #1160 from rneugeba/patch-up
kernel: Rebase kernel patches proper
2017-02-06 18:16:39 +00:00
Rolf Neugebauer
82c454a794 kernel: Rebase kernel patches proper
Regenerate the kernel patches from
https://github.com/rneugeba/linux-stable/

Note, the last two 4.9 patches are no properly
cherry-picked from linux-next. We previously had
0011-Drivers-hv-vmbus-Use-all... from an email.
0012-Drivers-hv-Log-the... is new, but may further aid
debugging version mismatch issues.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-02-06 17:57:26 +00:00
Rolf Neugebauer
dcff3b9cd0 Merge pull request #1158 from riyazdf/kernup
Update kernel to 4.9.8 and 4.4.47
2017-02-06 17:48:59 +00:00
Riyaz Faizullabhoy
83a8b220b1 Update kernel to 4.9.8 and 4.4.47
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-06 09:14:35 -08:00
Justin Cormack
501b00de29 Merge pull request #1156 from justincormack/top-level-dockerfiles
Simpler media Dockerfiles
2017-02-06 16:23:23 +00:00
Justin Cormack
84ae9017a5 Merge pull request #1157 from justincormack/restore-containerd
Restore containerd and runc images
2017-02-06 16:23:12 +00:00
Justin Cormack
4fa7e902c4 Restore containerd and runc containers
These were removed in #1145

Need these for a new build; keeping the current build in the
`alpine/` directory unchanged for editions for now so the issues
here do not affect them.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-06 16:08:11 +00:00
Justin Cormack
893afc851f Merge pull request #1155 from justincormack/hyper-script
Move hyperkit script to scripts directory
2017-02-06 15:51:45 +00:00
Justin Cormack
3f71568285 Simpler media Dockerfiles
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-06 15:50:40 +00:00
Justin Cormack
0eeb188e26 Move hyperkit script to scripts directory
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-06 15:28:32 +00:00