github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-30 22:21:34 +00:00
Code Issues Projects Releases Wiki Activity
1,896 Commits 1 Branch 27 Tags 240 MiB
421afc5000
Commit Graph

1896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
8d66c1984d Merge pull request #906 from justincormack/dockerup 
Update Docker to 1.13.0-rc4
 2016-12-16 22:52:52 -08:00
Justin Cormack
158924114a Update Docker to 1.13.0-rc4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-16 21:40:38 -08:00
Justin Cormack
b1a95e7f6f Merge pull request #901 from rneugeba/perf 
Add Linux perf utility
 2016-12-16 13:31:47 -08:00
Justin Cormack
9f37623519 Merge pull request #903 from riyazdf/sysrq-cloud-only 
Only disable sysrq for cloud editions
 2016-12-16 09:38:44 -08:00
Riyaz Faizullabhoy
bee11d02f7 Only disable sysrq for cloud editions 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-12-16 09:24:34 -08:00
Justin Cormack
2f79af3d1a Merge pull request #900 from simonferquel/remove_vsudd_output_from_console 
Remove vsudd output from the console.
 2016-12-16 09:11:34 -08:00
Rolf Neugebauer
e72977308c alpine: add Makefile/Dockerfile to build the Linux perf utility 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-12-16 17:04:43 +00:00
Rolf Neugebauer
2cb9fc5223 docs: update hub docs to include the TAG comment 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-12-16 16:21:39 +00:00
Rolf Neugebauer
d3889c2445 build: update packages to new alpine-build-c base 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-12-16 16:21:39 +00:00
Rolf Neugebauer
a75dac9751 base: add dependencies to build the Linux perf utility 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-12-16 15:10:52 +00:00
Simon Ferquel
5c096a83c1 Remove vsudd output from the console. 
vsudd is quite verbose, and we are confident enough about its stability.
This will clean Pinata logs as well indirectly

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2016-12-16 15:53:20 +01:00
Justin Cormack
8997809d01 Merge pull request #897 from justincormack/baseup 
Update base image
 2016-12-15 13:31:38 -08:00
Justin Cormack
aace941bab Update base image 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-15 13:22:11 -08:00
Justin Cormack
6c9e9249e4 Merge pull request #896 from justincormack/initrd-image 
make media pushing wrong image
 2016-12-15 13:17:27 -08:00
Justin Cormack
0ba24fa482 make media pushing wrong image 
The base image for scanning the initrd was being pushed over
the the media image for pinata.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-15 13:05:15 -08:00
Justin Cormack
f25bbc4be3 Merge pull request #895 from justincormack/kernel-context 
Use exact build context for kernel build
 2016-12-15 11:50:49 -08:00
Justin Cormack
0b7ffbd135 Use exact build context for kernel build 
Saves passing too much context, less error prone and should
mean builds are faster if not clean, consistent with elsewhere.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-15 11:27:41 -08:00
Justin Cormack
bca12fbd3e Merge pull request #892 from justincormack/kernelup 
Update AUFS kernel to 4.8.15
 2016-12-15 10:54:12 -08:00
Justin Cormack
5a54c8b714 Merge pull request #893 from justincormack/kernel-empty-dirs 
Create all directories for kernel
 2016-12-15 10:43:18 -08:00
Justin Cormack
75078a67bb Create all directories for kernel 
Non AUFS kernels do not create `sbin/` and `/usr` directories as they
do not provide the AUFS directories. Just create empty directories to
avoid a warning.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-15 10:26:00 -08:00
Justin Cormack
6b1a5d12f3 Merge pull request #891 from justincormack/doc-update 
Small update to the README
 2016-12-15 10:16:52 -08:00
Justin Cormack
c7bafd43e0 Update AUFS kernel to 4.8.15 
- minor update

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-15 10:13:01 -08:00
Justin Cormack
ccaec25074 Small update to the README 
- cover branches

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-15 09:16:38 -08:00
David Sheets
3615921fc2 Merge pull request #882 from dsheets/transfused-robustness 
transfused robustness
 2016-12-15 12:21:54 +00:00
David Sheets
58706fd84e transfused: use memcmp instead of a loop for checking init message 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
9d5309953f transfused: use read_exactly in subproto reading 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
ac7316427c transfused: use read_exactly in init thread message reading 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
fdc8afd32d transfused: factor read_exactly out of read_message 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
8580cfec80 transfused: minor formatting fixup 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
b9ff275a88 transfused: replace brittle init control message writing with write_exactly 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
6cf50dd803 transfused: replace brittle event pid writing with write_exactly 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
78328cf026 transfused: improve write_exactly error handling 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
David Sheets
6b1ef63d79 transfused: improve read_message robustness 
Signed-off-by: David Sheets <dsheets@docker.com>
 2016-12-15 11:03:29 +00:00
Justin Cormack
470063b79b Merge pull request #888 from justincormack/cpio-container 
Run cpio in a container
 2016-12-14 19:15:01 -08:00
Justin Cormack
ade4d6cc4b Run cpio in a container 
This way it runs as root so files always owned by root.

Fix #887

This is the simplest fix for 1.13, we can also use this for
creating the main system initrd, but that needs more changes
so leaving for 1.14.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-14 17:56:57 -08:00
Justin Cormack
82ea5c0d90 Merge pull request #836 from justincormack/yama 
Add Yama LSM
 2016-12-14 17:49:27 -08:00
Justin Cormack
6911b9b0df Merge pull request #886 from justincormack/ipvlan-4.9 
Tweak kernel networking options
 2016-12-14 17:24:10 -08:00
Justin Cormack
82d1864b9b Merge pull request #884 from justincormack/make-ci 
Add new Makefile targets for the CI
 2016-12-14 17:23:44 -08:00
Justin Cormack
822e4df468 Add Yama LSM 
Default config is restricted ptrace, processes can only ptrace
related processes, such as child processes, rather than any process
with the same uid.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-14 17:04:36 -08:00
Justin Cormack
88c3d98af4 Tweak kernel networking options 
In 4.9 IPVLAN support needs NET_L3_MASTER_DEV to work.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-14 16:41:12 -08:00
Justin Cormack
9f64a9df00 Add new Makefile targets for the CI 
This builds both the standard and AUFS versions of Moby,
and does `make clean` carefully.

- `make ci` for branches (pushes artifacts)
- `make pr` for PRs

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-14 16:05:54 -08:00
Justin Cormack
75b0814221 Merge pull request #880 from justincormack/kernel-4.8-4.9 
Make AUFS optional and ship choice of kernels
 2016-12-14 15:33:39 -08:00
Justin Cormack
da0d704acf Merge pull request #881 from FrenchBen/gce-upload 
Added simple upload of the image to bucket
 2016-12-14 11:26:20 -08:00
French Ben
d01892df11 Added simple upload of the image to bucket 
Signed-off-by: French Ben <frenchben@docker.com>
 2016-12-14 10:18:54 -08:00
Justin Cormack
3b774e3657 Make AUFS optional and ship choice of kernels 
This seems the best option, although none are great

- build with `make AUFS=1` to build with AUFS support, currently with 4.8 kernel
- default is to build without AUFS support, with 4.9 kernel

This recognises that AUFS supprot is temporary #620 and only there until
we can phase it out on desktop editions, and allow the other editions that
never shipped with AUFS to ship something very close to mainline.

However we do still apply the patches so that the non AUFS branch runs fine on
all platforms, so it can be tested elsewhere.

We may be able to move the kernel versions back in line when 4.9 aufs support is out.

Plan is to shift CI to build both sets of images, and get the Desktop editions to
pick up the aufs set automatically, once this is merged.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-13 18:23:45 -08:00
Justin Cormack
e4c8845091 Merge pull request #874 from justincormack/gce-image 
Build a GCE image
 2016-12-13 16:57:48 -08:00
Justin Cormack
2c55470450 Merge pull request #877 from justincormack/swap-safety 
Make sure we do not create a swap file if /var not mounted
 2016-12-13 16:25:57 -08:00
Justin Cormack
d7164176b5 Merge pull request #878 from justincormack/1.12-compat 
Only default to experimental if dockerd supports it
 2016-12-13 14:50:32 -08:00
Justin Cormack
7403c94ef4 Only default to experimental if dockerd supports it 
This allows 1.12 engine to still be supported on master.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-13 14:45:13 -08:00
Justin Cormack
8575ea050c Make sure we do not create a swap file if /var not mounted 
See #875

This will only happen if there has been some sort of error
before, but lets not make it worse.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-13 09:49:13 -08:00