Commit Graph

3720 Commits

Author SHA1 Message Date
Justin Cormack
15db5e4b42 Removed unused vendoring
Not required since #2025

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-15 14:15:36 -07:00
Rolf Neugebauer
d48715cd8c Merge pull request #2037 from tych0/usermode-helper
add a static usermode helper
2017-06-15 11:26:41 -07:00
Tycho Andersen
a4e0a594b1 add a static usermode helper
The binary is used in tandem with CONFIG_STATIC_USERMODEHELPER=y in 4.11+,
see the big comment in the binary for the current whitelist of binaries.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-15 10:39:52 -07:00
Riyaz Faizullabhoy
9d432095d0 Merge pull request #2044 from riyazdf/update-getty
Update getty image for setsid changes
2017-06-15 10:05:57 -07:00
Justin Cormack
d2278286ec Merge pull request #2042 from tych0/kernel-config-docs
Kernel config project docs
2017-06-15 18:17:26 +02:00
Riyaz Faizullabhoy
6dedac2fe9 Update getty image for setsid changes
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-15 09:16:12 -07:00
Justin Cormack
7cf06bb284 Merge pull request #2038 from rn/cold-plug
Support cold-plugging devices
2017-06-15 18:07:17 +02:00
Justin Cormack
ff3370a36f Merge pull request #2036 from deitch/fix-setsid-getty
copy setsid to setsidu so it does not get overwritten by busybox when…
2017-06-15 17:53:56 +02:00
Tycho Andersen
d9135b515c kernel config project: add a writeup
Add a writeup of how the kernel config project designed to behave when
migrating kernel versions.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-14 14:58:26 -07:00
Tycho Andersen
9757a33bf9 kernel config project: makeconfig.sh takes config as args
Instead of figuring out which config files to use inside of makeconfig.sh,
let's figure that out in the Dockerfile and pass them into the script.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-14 14:58:26 -07:00
Tycho Andersen
502c2c674f kernel-config: less special casing for PANIC_ON_OOPS
Instead of having a special case sed script, we can just put this in the
.debug config file, and have a special case when it's being checked.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-14 14:58:25 -07:00
Tycho Andersen
d14412810a kernel config project: s/x86/x86_64
Let's use the kernel machine architecture for this value.

Also remove a broken check. The "arch" binary on OSX outputs different
stuff than on linux. Since we don't need this check anyway  (the variable
is mostly to demonstrate how cross platform stuff would work, not to
actually do it yet), let's just remove the check.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-14 14:58:25 -07:00
Rolf Neugebauer
dfb4f292d3 Merge pull request #2040 from samoht/dhcp-rpc
sdk: replace custom transport protocol by Capnproto
2017-06-14 09:35:33 -07:00
Thomas Gazagnaire
eb2d2ee112 sdk: update the mirage-dhcp example to use latest parts
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-14 16:14:27 +01:00
Thomas Gazagnaire
fe86bad838 sdk: remove local fork of init package
The upstream init doesn't hardcode anything about dhcpcd anymore, so we can
just use it.

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-14 16:13:52 +01:00
Thomas Gazagnaire
e76d6c09a4 sdk: fix dhcp's Dockerfile
The rootfs were containing way too much binaries and runc command where not
started in the correct directory.

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-14 16:13:40 +01:00
Thomas Gazagnaire
6fb3820925 sdk: push images to miragesdk org on hub
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-14 12:09:02 +01:00
Thomas Gazagnaire
03cd4d6fd3 sdk: replace custom transport protocol by Capnproto
Initial patch by @talex5

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-14 11:43:27 +01:00
Avi Deitcher
42bf54de28 copy setsid to setsidu so it does not get overwritten by busybox when used in init, and ensure inittab is clean
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-06-14 13:22:18 +03:00
Riyaz Faizullabhoy
a914c0cd2b Merge pull request #2035 from tych0/shiftfs
projects: add shiftfs project
2017-06-13 16:00:01 -07:00
Rolf Neugebauer
90c441ef67 Update YAML files to new init
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-13 15:57:24 -07:00
Rolf Neugebauer
4e4efcd985 pkg: Add support for cold-plugged devices to init
mdev only supports hot-plug, ie devices which are added
after the kernel booted. For cold-plugged devices, ie devices
present when the kernel boots, we need to modprobe the drivers
differently. The additions to rc.init does just that.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-13 15:57:24 -07:00
Tycho Andersen
35292a63d5 fix typo
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-13 14:05:42 -06:00
Riyaz Faizullabhoy
c1950419ef Merge pull request #2032 from ijc/kubernetes
Small improvements to projects/kubernetes
2017-06-13 10:41:25 -07:00
Tycho Andersen
d29b2a909c projects: add shiftfs project
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-13 11:08:29 -06:00
Ian Campbell
e2eb17ef6c Only create qemu runner state dir if it is going to be used.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 17:22:08 +01:00
Ian Campbell
58d61d0846 tests: traverse directories before removing them during cleanup
Without `-depth` find will first `rm -rf foo` and then try to recurse into
`foo` resulting in `No such file or directory`.

With this the various `|| true` suffixes should no longer be required.

Lastly, in test/cases/040_packages/013_mkimage/test.sh cleanup any
`disk.qcow2*` detritus as well as the image itself.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 17:15:33 +01:00
Justin Cormack
fd00f19c59 Merge pull request #2030 from riyazdf/cve-4.9.31
docs: update security events with new kernels
2017-06-13 16:53:02 +02:00
Ian Campbell
13a94c7a3c Add metadata support to Qemu runner.
Based on the hyperkit runner's code.

project/kubernetes/boot.sh now works, although lack of network connectivity
between individual VMs remains an issue.

Also manually validated containerized operation with:

    rm -rf kube-node-0-state && ../../bin/linuxkit run qemu --containerized  -cpus 2 -mem 4096 -state kube-node-0-state -disk size=4G -data "foo bar" kube-node

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 11:08:53 +01:00
Ian Campbell
a09090e6cd Add state dir support to Qemu runner.
Modelled on the Hyperkit runner, for now only used for the disk.

This is one step closer to having project/kubernetes/boot.sh work on Linux.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 11:08:53 +01:00
Ian Campbell
c47b2c770c kubernetes: Create disk in state dir
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 11:08:44 +01:00
Ian Campbell
d4f601f6fb kubernetes: give each instance a specific state directory
In particular avoid all nodes sharing the same default directory.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 09:31:43 +01:00
Ian Campbell
ec2b56da5a kubernetes: Combine boot-{master,node}.sh into a single script
Easier to get a global view on what is happening.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 09:31:43 +01:00
Ian Campbell
4162cfb834 kubernetes: update to latest init
and add the getty container.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-13 09:31:43 +01:00
Riyaz Faizullabhoy
69b89869ea update security events with new kernels
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-12 14:52:33 -07:00
Anil Madhavapeddy
d310ebf44f Merge pull request #2029 from avsm/week-23-dev-report
reports: add week 23 dev report
2017-06-12 19:08:17 +01:00
Anil Madhavapeddy
d2fb76a86a reports: add week 23 dev report
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2017-06-12 18:47:34 +01:00
Riyaz Faizullabhoy
4a326e6126 Merge pull request #2025 from justincormack/remove-initrd-lib
Remove initrd library, it has moved to moby tool
2017-06-12 09:51:07 -07:00
Riyaz Faizullabhoy
4d7f241ef4 Merge pull request #2026 from justincormack/4.11-fixes
re-enable CONFIG_BUG_ON_DATA_CORRUPTION on 4.11 kernel
2017-06-12 09:47:31 -07:00
Riyaz Faizullabhoy
e7a63dfe41 Merge pull request #2028 from justincormack/stray-tick
Remove stray `
2017-06-12 09:31:12 -07:00
Riyaz Faizullabhoy
35977c53d6 Merge pull request #2022 from justincormack/sys-in-getty
mount /sys in getty container and add and fix kernel tests
2017-06-12 09:29:44 -07:00
Justin Cormack
aedc9080a1 Remove stray `
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-12 17:31:17 +02:00
Justin Cormack
90a5cad216 Add filesystem tests into kernel test and fix failure cases
Make sure we do not remove filesystems we expect to have.

Fix the failure cases for the kernel tests which were not working properly
due to shell code.

Fix some 4.11 kernel changes in config that show up once tests are fixed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-12 17:25:25 +02:00
Justin Cormack
e41bd3a546 Merge pull request #2008 from MagnusS/vpnkit-forwarder
vpnkit-forwarder: add /pkg/vpnkit-forwarder
2017-06-12 16:38:03 +02:00
Magnus Skjegstad
24ec30e74c vpnkit-forwarder: add /pkg/vpnkit-forwarder
Adds /pkg/vpnkit-forwarder which downloads and builds vpnkit-forwarder
and vpnkit-expose-port from moby/vpnkit. Also includes an example for
forwarding `sshd` and updates the documentation for `hyperkit` to
include a `vpnkit` section.

`vpnkit` still requires a 9P mount for coordination, so the `socat`
forwarding is simpler to set up at the moment.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-12 14:46:48 +01:00
Justin Cormack
6f62d083df Remove initrd library, it has moved to moby tool
As we are not using it here, makes more sense for it to go there.

Moved with history in https://github.com/moby/tool/pull/78

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-12 15:41:27 +02:00
Justin Cormack
de1b54ca07 Merge pull request #2024 from leafmulch/docsfix/platform-aws-output
Update aws platform docs
2017-06-12 14:56:44 +02:00
Justin Cormack
d5ee981a0a re-enable CONFIG_BUG_ON_DATA_CORRUPTION on 4.11 kernel
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-12 14:44:20 +02:00
Jes Ferrier
e3ce70c35f Update aws platform docs
- Replace img with raw for moby -output

Signed-off-by: Jes Ferrier <jes.ferrier@gmail.com>
2017-06-12 12:47:16 +01:00
Justin Cormack
33092fa111 Merge pull request #2023 from justincormack/readme-roadmap
Move roadmap to README where there is only one
2017-06-12 12:38:25 +02:00