github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity
2,122 Commits 1 Branch 27 Tags 240 MiB
084291469c
Commit Graph

2122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Justin Cormack
5256eb0263 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
83b9afce02 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
364afbfb9a Merge pull request #1160 from rneugeba/patch-up 
kernel: Rebase kernel patches proper
 2017-02-06 18:16:39 +00:00
Rolf Neugebauer
5af19ac52b 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
b99df54a98 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
46fde10eaf 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
65e2c49ca2 Merge pull request #1156 from justincormack/top-level-dockerfiles 
Simpler media Dockerfiles
 2017-02-06 16:23:23 +00:00
Justin Cormack
e98cc781e2 Merge pull request #1157 from justincormack/restore-containerd 
Restore containerd and runc images
 2017-02-06 16:23:12 +00:00
Justin Cormack
73e4be3139 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
f932384ffd Merge pull request #1155 from justincormack/hyper-script 
Move hyperkit script to scripts directory
 2017-02-06 15:51:45 +00:00
Justin Cormack
38ef228b7b Simpler media Dockerfiles 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 15:50:40 +00:00
Justin Cormack
4aa0444c92 Move hyperkit script to scripts directory 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 15:28:32 +00:00
Justin Cormack
8aabf316e7 Merge pull request #1154 from justincormack/aufsup 
Update aufs to 20170206
 2017-02-06 12:20:17 +00:00
Justin Cormack
2470af59a0 Update aufs to 20170206 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 11:57:30 +00:00
Justin Cormack
d7cea0f8cc Merge pull request #1153 from justincormack/fix-media 
Fix up directory moves in media Dockerfile
 2017-02-06 11:16:49 +00:00
Justin Cormack
66a803a0a7 Fix up directory moves in media Dockerfile 
These broke pushing from master

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 11:01:09 +00:00
Justin Cormack
080008de16 Merge pull request #1152 from justincormack/mv-test2 
Explicitly build the containers we want in alpine/ directory
 2017-02-05 08:59:06 +01:00
Justin Cormack
69346b6cf4 Explicitly build the containers we want in alpine/ directory 
This will be kept for editions until the new fully containerised
version can replace it.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-04 14:47:00 +01:00
Justin Cormack
f524a1eb5a Merge pull request #1146 from justincormack/mv-kernel 
Move kernel directory to top level
 2017-02-04 12:02:25 +01:00