github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-30 14:10:57 +00:00
Code Issues Projects Releases Wiki Activity
912 Commits 1 Branch 27 Tags 240 MiB
40d6e10924
Commit Graph

912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Justin Cormack
2590c9de9b Merge pull request #277 from justincormack/ulimit_nofile 
set nofile ulimit to maximum possible value
 2016-07-13 14:05:43 +01:00
Justin Cormack
9c0a1387ea set nofile ulimit to maximum possible value 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-13 14:04:49 +01:00
Justin Cormack
a14f34701e Merge pull request #276 from justincormack/docker-1.12.0-rc4 
update to 1.12.0-rc4 upstream version
 2016-07-13 09:54:41 +01:00
Justin Cormack
261544cf02 update to 1.12.0-rc4 upstream version 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-13 09:50:25 +01:00
Justin Cormack
84e90a538b Merge pull request #275 from justincormack/quotes 
modernise...
 2016-07-12 16:16:42 +01:00
Justin Cormack
d4131e9bc0 modernise... 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 16:02:49 +01:00
Justin Cormack
cb027e6e3b Merge pull request #274 from justincormack/posix 
posixly correct
 2016-07-12 15:45:23 +01:00
Justin Cormack
deb29a7f56 posixly correct 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 15:44:43 +01:00
Justin Cormack
df613f1f3f Merge pull request #271 from rneugeba/init-fix 
Fix transfused and docker init scripts
 2016-07-12 15:09:37 +01:00
Rolf Neugebauer
1977888b18 diagnostics: Don't check for transfused on Windows 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:28:11 +01:00
Rolf Neugebauer
c09905199a init: don't start docker on 0.0.0.0:2375 on DfM/DfW 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:08:55 +01:00
Rolf Neugebauer
b499b52d48 init: don't start transfused on Windows 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:04:08 +01:00
Justin Cormack
7529e51e61 Merge pull request #270 from justincormack/fixscript 
clean up moby script, add undo option
 2016-07-12 13:35:24 +01:00
Justin Cormack
df4eeaff80 clean up moby script, add undo option 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 13:34:49 +01:00
Justin Cormack
782c7f737b Merge pull request #269 from rneugeba/kernel-up 
kernel: Update to 4.4.15
 2016-07-12 10:42:59 +01:00
Rolf Neugebauer
9d5797cdd3 kernel: Update to 4.4.15 
patches from: https://github.com/rneugeba/linux-stable/tree/v4.4.15-moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 10:36:57 +01:00