Commit Graph

2904 Commits

Author SHA1 Message Date
Justin Cormack
ca7f21ad7b Merge pull request #1579 from avsm/moby-run-help
tweak `moby run` CLI help to reflect that it supports GCP as well
2017-04-11 11:37:52 +01:00
Anil Madhavapeddy
e8cbf1a23e tweak moby run CLI help to reflect that it supports GCP as well
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2017-04-11 11:18:55 +01:00
Justin Cormack
64933fa292 Merge pull request #1572 from errordeveloper/kubernetes
Working single-node Kubernetes setup
2017-04-11 09:56:35 +01:00
Ilya Dmitrichenko
85b54d5717 Fix shared mounts – working single-node Kubernetes setup
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2017-04-11 09:43:07 +01:00
Justin Cormack
ceeddedbf5 Merge pull request #1577 from riyazdf/errchecking
catch and handle errors in src/cmd/moby
2017-04-10 21:48:41 +01:00
Justin Cormack
27c5bd7164 Merge pull request #1553 from riyazdf/docker-bench-test
test: run docker bench container
2017-04-10 21:40:43 +01:00
Justin Cormack
f9a13a2fc3 Merge pull request #1576 from justincormack/openntpd
Add openntpd container
2017-04-10 21:38:46 +01:00
Riyaz Faizullabhoy
2fea805be1 catch and handle errors in src/cmd/moby
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-10 13:36:46 -07:00
Riyaz Faizullabhoy
38e17f365d test: run docker bench container
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-10 13:34:17 -07:00
Justin Cormack
67619d751b Merge pull request #1573 from riyazdf/qemu-err-catch
qemu: catch error on disk create and exit with message
2017-04-10 20:54:03 +01:00
Justin Cormack
8c0b40d9f7 Merge pull request #1574 from riyazdf/init-hierarchy
bump init image to include hierarchy fix
2017-04-10 20:51:18 +01:00
Justin Cormack
a3ec9e86df Add openntpd container
Added to Docker example as Swarm mode likes time sync.

Note uses pool.ntp.org at present, on some providers it
should use a different source.

Constraints not enabled as they seem to have an issue;
possibly trying to set before network is up.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-10 20:32:59 +01:00
Riyaz Faizullabhoy
cab4807e59 qemu: catch error on disk create and exit with message
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-10 12:09:54 -07:00
Riyaz Faizullabhoy
5f90faeafa init: update main moby example and tests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-10 11:59:23 -07:00
Justin Cormack
3afe494ae9 Merge pull request #1567 from justincormack/sysfs
Add a sysfs container and fix memory hierarchy
2017-04-10 17:59:37 +01:00
Ilya Dmitrichenko
91c4278c77 Use new modular init containers, flatten kubelet image
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2017-04-10 17:43:12 +01:00
Justin Cormack
46799eb2de Merge pull request #1571 from dave-tucker/panic
Fix panic in gcp code
2017-04-10 17:37:52 +01:00
Justin Cormack
84034a0370 Merge pull request #1570 from justincormack/containerd-toml-default
Use the real default containerd toml config
2017-04-10 17:32:36 +01:00
Dave Tucker
0ece2e8227 moby: use type assertion to avoid panic in gcp code
Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-10 17:29:59 +01:00
Justin Cormack
bc23fde1c2 Use the real default containerd toml config
Rather than an empty one.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-10 16:25:13 +01:00
Rolf Neugebauer
270e091d07 Merge pull request #1569 from rneugeba/hyperkit
Various hyperkit updates
2017-04-10 16:22:54 +01:00
Rolf Neugebauer
34af633552 infrakit: rename the Moby property to kernel+initrd
The infrakit plugin is not specific to Moby and should be able
to boot other Linux systems as long as a kernel image and
initial RAM disk are supplied. Reflect this in the property
passed to the plugin.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-10 16:12:08 +01:00
Rolf Neugebauer
70a27b667e infrakit: Adjust hyperkit instance plugin to new API
The new API does not provide the option to pass in user data
anymore. Roll our own ISO instead.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-10 15:56:38 +01:00
Rolf Neugebauer
db244ee9fd cli: Adjust run_hyperkit to changed API
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-10 15:56:20 +01:00
Rolf Neugebauer
ff8105a474 vendor: Update hyperkit go bindings
This will break compilation, until the next commit

Also update some package strings in 'vendor.conf' as the new vndr
was complaining about them not being root imports.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-10 15:23:37 +01:00
Justin Cormack
0ffc2867a9 Use hierarchy for memory cgroups
Container systems expect this...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-10 14:36:06 +01:00
Justin Cormack
821fdaecc8 Remove SELinux setup until actually implemented
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-10 14:35:07 +01:00
Justin Cormack
efd1efe531 Add a sysfs container
However, do not try to change memory cgroups from it; this needs to be in `init`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-10 14:33:38 +01:00
Justin Cormack
bd5780e46d Merge pull request #1565 from justincormack/var-rework-again
Rework how /var is mounted
2017-04-10 14:27:40 +01:00
Rolf Neugebauer
47402c955c Merge pull request #1566 from rneugeba/etcd-clean
demo: Remove jq and sfdisk from etcd image
2017-04-10 11:53:35 +01:00
Rolf Neugebauer
29ad037125 demo: Remove jq and sfdisk from etcd image
They are no longer needed as the mounting happens in the
mount container.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-10 11:41:17 +01:00
Justin Cormack
9ee52aa966 Rework how /var is mounted
Instead of mounting a new filesystem, revert to doing a `rw` bind.

However do not make `/` `rshared`, just `/var` as that is where we expect
filesystems to be mounted for persistence. Also only make the actual
container rootfs writeable, not the whole directory.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-10 11:28:00 +01:00
Justin Cormack
ce70127028 Merge pull request #1561 from riyazdf/landlock-makefile-dockerfile
Landlock: kernel build materials and example yml
2017-04-10 10:48:37 +01:00
Rolf Neugebauer
f2ec32a043 Merge pull request #1563 from rneugeba/kern-up
kernel: Update to 4.10.9/4.9.21/4.4.60
2017-04-09 23:12:49 +01:00
Rolf Neugebauer
201f89de74 kernel: Update to 4.10.9/4.9.21/4.4.60
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-09 22:50:18 +01:00
Justin Cormack
221dac183f Merge pull request #1560 from DieterReuter/patch-1
Fix link to Landlock project
2017-04-09 22:12:26 +01:00
Dieter Reuter
f6c2bca4cb Fix link to Landlock project
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2017-04-09 20:06:04 +00:00
Justin Cormack
82d960c604 Merge pull request #1562 from rneugeba/demo-up
demo: Update etcd to use the new mount container
2017-04-09 21:00:26 +01:00
Rolf Neugebauer
baab60ea87 demo: Update etcd to use the new mount container
Rolling updates still work

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-09 20:50:10 +01:00
Riyaz Faizullabhoy
3aead78f36 landlock: example yml
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-09 12:09:06 -07:00
Riyaz Faizullabhoy
b95ca1b358 landlock: gitignore for kernel build
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-09 12:08:53 -07:00
Riyaz Faizullabhoy
f89bd06edb landlock: Makefile with kernel-landlock name
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-09 12:07:10 -07:00
Riyaz Faizullabhoy
1e9495e609 landlock: Dockerfile
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-09 12:06:48 -07:00
Justin Cormack
9d1b120498 Merge pull request #1559 from l0kod/landlock-v6-linux-v4.9.20
Backport Landlock v6 for Linux v4.9.20
2017-04-09 19:31:21 +01:00
Mickaël Salaün
296a0f4560 landlock: Backport patches from the sixth series
Backport from Linux v4.11-rc3-812-gc6bf33827b7d to Linux 4.9.20:
https://github.com/landlock-lsm/linux/commits/landlock-v6-linux-v4.9.20

Do not include documentation nor tests.

See built documentation here:
https://landlock-lsm.github.io/linux-doc/landlock-v6/security/landlock/index.html

Signed-off-by: Mickaël Salaün <mic@digikod.net>
Link: https://lkml.kernel.org/r/20170328234650.19695-1-mic@digikod.net
2017-04-09 19:45:24 +02:00
Mickaël Salaün
792238f5cb landlock: Add kernel_config{,.debug}
Based on kernel_config{,.debug} from commit
724561bf69

Enable Landlock and userland sandbox example:
* CONFIG_SECURITY_LANDLOCK=y
* CONFIG_SAMPLES=y

Signed-off-by: Mickaël Salaün <mic@digikod.net>
2017-04-09 19:45:24 +02:00
Mickaël Salaün
c6b3c62b83 landlock: Link to project
Signed-off-by: Mickaël Salaün <mic@digikod.net>
2017-04-09 19:45:24 +02:00
Justin Cormack
60f84fb917 Merge pull request #1558 from justincormack/report-9-april
Add weekly report for 9 April 2017
2017-04-09 17:38:12 +01:00
Justin Cormack
6476ed0441 Add weekly report for 9 April 2017
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-09 17:00:40 +01:00
Justin Cormack
74b720a42a Merge pull request #1557 from justincormack/mount-take-2
Make mount a standalone package, fix mount propagation
2017-04-09 16:02:24 +01:00