github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-05 00:39:34 +00:00
Code Issues Projects Releases Wiki Activity
1,076 Commits 1 Branch 27 Tags 240 MiB
79f6eac123
Commit Graph

1076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
626ad90e41 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
ebbbad474f Merge pull request #295 from justincormack/nottytests 
make test should not need a tty
 2016-07-18 14:53:54 +01:00
Justin Cormack
d94742d46a Merge pull request #297 from justincormack/mobyplatform 
Add conditional services based on mobyplatform
 2016-07-18 14:53:38 +01:00
Justin Cormack
3d3b67d0c3 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
07052d1875 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
e115aebeaa Merge pull request #294 from justincormack/armfixes 
fix arm build
 2016-07-15 17:10:34 +01:00
Justin Cormack
7e495fb7a8 fix arm build 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 17:02:14 +01:00
Justin Cormack
0f86d03edd Merge pull request #293 from justincormack/inittabfix 
do not remove inittab in clean
 2016-07-15 16:52:30 +01:00
Justin Cormack
43b9834123 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
77f5063e76 Merge pull request #292 from justincormack/slashes 
clean up trailing slashes
 2016-07-15 16:24:43 +01:00
Justin Cormack
2cdf39c72f clean up trailing slashes 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 16:23:33 +01:00
Justin Cormack
6c8e17e773 Merge pull request #291 from justincormack/capdoc 
remove unnecessary capabilities from nginx example
 2016-07-15 15:26:05 +01:00
Justin Cormack
86d898cac8 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
7308da55dc Merge pull request #290 from justincormack/containerd-docs 
Add documentation for system containerd
 2016-07-15 15:18:05 +01:00
Justin Cormack
a451fd0d1e 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
e9d4be8f3d Merge pull request #289 from justincormack/containerd-logs 
capture containerd logs
 2016-07-15 15:11:37 +01:00
Justin Cormack
ceafadb6a4 capture containerd logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 15:11:06 +01:00
Justin Cormack
6afd5105a6 Merge pull request #288 from justincormack/qemumem 
more memory for qemu
 2016-07-15 14:36:30 +01:00
Justin Cormack
c8e6b10037 more memory for qemu 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 13:31:59 +01:00
Justin Cormack
5f8afdf582 Merge pull request #287 from justincormack/upstream-securetty 
Use upstream /etc/securetty
 2016-07-15 11:59:13 +01:00
Justin Cormack
b3b38aacc1 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
94778bc174 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
d6e65aae59 Merge pull request #286 from justincormack/waitsock 
wait for system containerd to start
 2016-07-15 11:41:53 +01:00
Justin Cormack
5b0d4acfdc 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
2dfa4291fa 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
5b7ff1f6ef 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
cd18b353a3 Merge pull request #281 from justincormack/containerd 
Add a system containerd
 2016-07-14 12:32:07 +01:00
Justin Cormack
0ec195786a 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
8e03b120c3 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
e67c6dd0d7 Merge pull request #279 from ncopa/kernel-build 
improve kernel build makefile
 2016-07-13 17:29:24 +01:00
Natanael Copa
67c8361d54 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
dc47de083e 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
235ab00582 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
47545dce55 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
92dcb04653 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
9dad6b6467 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
ebd3e2ae26 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
72861a6c88 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
33eb13af7f Merge pull request #275 from justincormack/quotes 
modernise...
 2016-07-12 16:16:42 +01:00
Justin Cormack
09e966b3a2 modernise... 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 16:02:49 +01:00
Justin Cormack
ed38dad3c8 Merge pull request #274 from justincormack/posix 
posixly correct
 2016-07-12 15:45:23 +01:00
Justin Cormack
c008b08ddf posixly correct 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-12 15:44:43 +01:00
Justin Cormack
bbbbc2a121 Merge pull request #271 from rneugeba/init-fix 
Fix transfused and docker init scripts
 2016-07-12 15:09:37 +01:00
Rolf Neugebauer
0aee0c0ed5 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
f8c53db413 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
6c95bff567 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
17406ab88b Merge pull request #270 from justincormack/fixscript 
clean up moby script, add undo option
 2016-07-12 13:35:24 +01:00
Justin Cormack
da374fb13a 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
a022934760 Merge pull request #269 from rneugeba/kernel-up 
kernel: Update to 4.4.15
 2016-07-12 10:42:59 +01:00
Rolf Neugebauer
2171a2e471 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