github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity
978 Commits 1 Branch 27 Tags 240 MiB
cfca271950
Commit Graph

978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rolf Neugebauer
4127e24a17 Merge pull request #308 from justincormack/transfusedvmbus 
Only run transfused on mac platform
 2016-07-20 12:21:18 +01:00
Rolf Neugebauer
996cab9f17 Merge pull request #307 from justincormack/proxyvmbus 
use platform not vmbus consistently
 2016-07-20 12:17:20 +01:00
Justin Cormack
093a81064b Only run transfused on mac platform 
See #301

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:11:39 +01:00
Justin Cormack
487307a551 use platform not vmbus consistently 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:07:40 +01:00
Justin Cormack
c1922f2f25 Fix up chronyd support for editions 
See #305 #301

This sets AWS to use the amazon ntp pool, windows to do nothing,
mac uses ntp it gets from DNS. Azure currently uses default pool,
this probably needs fixing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:02:59 +01:00
Justin Cormack
ec9a4a5428 Merge pull request #304 from justincormack/norawtcp 
Remove rawtcp from diagnostics server
 2016-07-20 11:48:18 +01:00
Justin Cormack
2bf06aab05 Remove rawtcp from diagnostics server 
See https://github.com/docker/moby/pull/303

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 11:46:54 +01:00
Justin Cormack
a9e76d2151 Merge pull request #303 from nathanleclaire/diagnostic_server_cloud 
Add cloud/HTTP support to diagnostics server
 2016-07-20 11:45:50 +01:00
Nathan LeClaire
1e0dfd4798 Re-write diagnostic server to support cloud/HTTP 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-19 17:40:15 -07:00
Justin Cormack
8a177d59f8 Merge pull request #284 from nathanleclaire/azure 
Add support for Azure (VHD) build to Moby
 2016-07-19 22:44:01 +01:00
Justin Cormack
bce39e0eb0 Merge pull request #300 from justincormack/nodnsfix 
Remove dnsfix
 2016-07-19 10:09:43 +01:00
Justin Cormack
99c2a09403 Remove dnsfix 
This was there to workaround an issue with vmnet, not applicable now.
A user reported that they were getting unexpected 8.8.8.8 addresses
and it could possible be applied erroneously under some circumstances.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-07-19 10:04:09 +01:00
Nathan LeClaire
70cb4f82a2 Add Azure provider support 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-18 16:22:21 -07:00
Justin Cormack
2648b0155f Merge pull request #283 from nathanleclaire/aws 
Add AWS build support to Moby
 2016-07-18 20:01:33 +01:00
Nathan LeClaire
abb968c538 Add AWS build support 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-18 11:08:44 -07:00
Justin Cormack
0a01b10b1a Merge pull request #299 from justincormack/bettertestrun 
Improve make test output
 2016-07-18 16:24:12 +01:00
Justin Cormack
40d6e10924 Improve make test output 
Incrementally output log, and exit as soon as tests pass
or fail. Will still timeout on a kernel panic or suchlike
though...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-18 16:05:01 +01:00
Justin Cormack
4739e907fc Merge pull request #295 from justincormack/nottytests 
make test should not need a tty
 2016-07-18 14:53:54 +01:00
Justin Cormack
3d43402e61 Merge pull request #297 from justincormack/mobyplatform 
Add conditional services based on mobyplatform
 2016-07-18 14:53:38 +01:00
Justin Cormack
67b2a00853 Add conditional services based on mobyplatform 
Replaces https://github.com/docker/moby/pull/282

Use mobyplatform=xxx to specify platform in boot command

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-18 12:39:14 +01:00
Justin Cormack
6e8b504efd make test should not need a tty 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-18 11:08:26 +01:00
Justin Cormack
18bcc15d20 Merge pull request #294 from justincormack/armfixes 
fix arm build
 2016-07-15 17:10:34 +01:00
Justin Cormack
3d6ba289d1 fix arm build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 17:02:14 +01:00
Justin Cormack
85ed0cef64 Merge pull request #293 from justincormack/inittabfix 
do not remove inittab in clean
 2016-07-15 16:52:30 +01:00
Justin Cormack
07fb25c8eb do not remove inittab in clean 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 16:51:57 +01:00
Justin Cormack
5354079993 Merge pull request #292 from justincormack/slashes 
clean up trailing slashes
 2016-07-15 16:24:43 +01:00
Justin Cormack
a6e5d9fdfa clean up trailing slashes 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 16:23:33 +01:00
Justin Cormack
d9b3f37dfd Merge pull request #291 from justincormack/capdoc 
remove unnecessary capabilities from nginx example
 2016-07-15 15:26:05 +01:00
Justin Cormack
4cfb71eafc remove unnecessary capabilities from nginx example 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 15:25:40 +01:00
Justin Cormack
7b8c615387 Merge pull request #290 from justincormack/containerd-docs 
Add documentation for system containerd
 2016-07-15 15:18:05 +01:00
Justin Cormack
449e0c7d7e Add documentation for system containerd 
Add an example script showing how you can run an nginx container.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 15:17:04 +01:00
Justin Cormack
b2098526c4 Merge pull request #289 from justincormack/containerd-logs 
capture containerd logs
 2016-07-15 15:11:37 +01:00
Justin Cormack
6848ddd58e capture containerd logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 15:11:06 +01:00
Justin Cormack
79a03389af Merge pull request #288 from justincormack/qemumem 
more memory for qemu
 2016-07-15 14:36:30 +01:00
Justin Cormack
f9e25c395f more memory for qemu 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 13:31:59 +01:00
Justin Cormack
a66043b100 Merge pull request #287 from justincormack/upstream-securetty 
Use upstream /etc/securetty
 2016-07-15 11:59:13 +01:00
Justin Cormack
96489524e7 Use upstream /etc/securetty 
Now we modify the file if we use a different console, can use
upstream unmodified.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:58:01 +01:00
Justin Cormack
092ec97a88 Merge pull request #273 from ncopa/init-console 
add console options from boot cmdline to inittab
 2016-07-15 11:42:00 +01:00
Justin Cormack
b7df210754 Merge pull request #286 from justincormack/waitsock 
wait for system containerd to start
 2016-07-15 11:41:53 +01:00
Justin Cormack
252077a4ba wait for system containerd to start 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:38:05 +01:00
Justin Cormack
5edb4c5fb4 Merge pull request #285 from justincormack/waitsock 
Wait for docker to finish starting up before terminateing init script
 2016-07-15 11:30:38 +01:00
Justin Cormack
498c481700 Wait for docker to finish starting up before terminateing init script 
This means dependent services can rely on docker being up.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:29:32 +01:00
Justin Cormack
37cd71fa0d Merge pull request #281 from justincormack/containerd 
Add a system containerd
 2016-07-14 12:32:07 +01:00
Justin Cormack
220f3df37a Add a system containerd 
This adds an independent system containerd for running internal
containers.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-14 12:28:44 +01:00
Natanael Copa
9bbf27cb66 merge inittab.x86_64 and inittab.armhf 
with the login tty generated from boot cmdline the inittab will be equal
on all archs and platforms so we can merge and move to etc/

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:48:26 +02:00
Justin Cormack
5c32d68d13 Merge pull request #279 from ncopa/kernel-build 
improve kernel build makefile
 2016-07-13 17:29:24 +01:00
Natanael Copa
34bd1e9322 fix initrd.img dependencies 
trigger rebuild if init or inittab was changed

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:28:46 +02:00
Natanael Copa
39d3ac8429 remove getty from inittab 
Depend on specifying the console as a boot option

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:28:28 +02:00
Natanael Copa
bf4ced07d0 add console options from boot cmdline to inittab 
This will make sure that you get a login console that corresponds to the
boot option.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:27:09 +02:00
Natanael Copa
907d1f8c0c improve kernel build makefile 
- create an empty dummy file to indicate that docker image is built
- reuse same make rule to extract the different files from docker image
- make sure that we remove empty files on failure

This makes build more robust and improves parallelism.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:03:16 +02:00