Commit Graph

2785 Commits

Author SHA1 Message Date
Ian Campbell
6a0bd7d035 Initial swarmkit package
This is based on https://github.com/docker/swarmkit/pull/1965 which adds a
direct containerd executor to swarmkit. It is very much a work in progress.

With a suitable moby image (such as projects/swarmd/swarmd.yml) something like
this should work:

runc exec swarmd swarmctl service create --image docker.io/library/nginx:alpine --name nginx
runc exec swarmd swarmctl service ls

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-04-04 16:00:03 +01:00
Rolf Neugebauer
c0e416a2a5 Merge pull request #1484 from rneugeba/demo-plus
demo: Initial etcd cluster setup with InfraKit
2017-04-04 15:47:16 +01:00
Rolf Neugebauer
fc84079db3 demo: Initial etcd cluster setup with InfraKit
This just sets up the initial cluster via bootstrap.

It does *not* manage state changes correctly afterwards. If one
node crashes (get's killed) it InfraKit will start a new node,
but the new node does not join the cluster (and the old node
is not removed, either).

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-04 15:37:41 +01:00
Rolf Neugebauer
f08ff5cfa8 Merge pull request #1483 from rneugeba/demo-up
Add WIP files for demo
2017-04-04 14:03:25 +01:00
Rolf Neugebauer
4b3422f76c demo: WIP for a local etcd setup
- Script to set up a DfM etcd for bootstrapping a cluser
- Custom/local etcd package for moby
  derived from the official image with script to start etcd
- YAML file to create a etcd moby image
- README with current instructions

This has a bunch of stuff, including the discovery URL hard coded.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-04 13:46:19 +01:00
Rolf Neugebauer
218ec6d3d5 demo: Dummy infrakit demo using nginx
This will change to something more distributed...

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-04 13:45:32 +01:00
Rolf Neugebauer
5122afffb1 demo: Add simplest YAML for introducing moby
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-04 13:45:03 +01:00
Justin Cormack
87ebac9976 Merge pull request #1482 from justincormack/split-inspect
Split out OCI generation function
2017-04-04 12:25:15 +01:00
Justin Cormack
493aeaa78d Split out OCI generation function
This is to make unit testing easier for #1481

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-04 11:28:30 +01:00
Justin Cormack
4d9bd63b1b Merge pull request #1439 from dave-tucker/uefi
Add a runner for UEFI ISOs
2017-04-04 10:52:32 +01:00
Justin Cormack
01fba0f3f5 Merge pull request #1479 from justincormack/command
Revert Command->Args but remove from yaml where not needed
2017-04-04 10:49:32 +01:00
Justin Cormack
11555b5a44 Merge pull request #1478 from justincormack/no-log-driver
Disable log driver for docker run
2017-04-04 09:53:47 +01:00
Justin Cormack
57c75741e9 Revert Command->Args but remove from yaml where not needed
In the riddler change I changed "command" in the yaml to "args"
but did not change the files. In fact we basically used the
default command everywhere so this did not actually break.

Remove the unnecessary "command" lines to simplify yaml.

Revert the command to args change for now as I think I prefer
command, but its easier to switch now. Need to think if the
entrypoint/command distinction matters before finalizing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-04 09:51:17 +01:00
Justin Cormack
75a23cf822 Disable log driver for docker run
We are generally outputting to stdout pipe which the log driver does
not cope with very well; always did this in older builds.

Saves another 5% of build time.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-04 09:36:25 +01:00
Thomas Gazagnaire
911ecdc749 Merge pull request #1467 from samoht/better-init
mirage-sdk: better init
2017-04-04 10:12:37 +02:00
Rolf Neugebauer
7f57c4cfff Merge pull request #1447 from thebsdbox/vmware
VMware backend support
2017-04-04 09:07:25 +01:00
Thomas Gazagnaire
2dbcf99030 miragesdk: do not force the creation of pipes when linking with the SDK
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-04-04 10:06:59 +02:00
Thomas Gazagnaire
4944652d37 miragesdk: improve dev README
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-04-04 10:05:22 +02:00
Justin Cormack
155105684e Merge pull request #1475 from rneugeba/vendor
vendor: Fix iso9660wrap hash
2017-04-03 23:59:19 +01:00
Rolf Neugebauer
1fec51c6f5 vendor: Fix iso9660wrap hash
vendor.conf got messed up on a previous merge conflict. Update
the git hash to reflect the version checked into vendor/github.com/rneugeba

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-03 23:52:00 +01:00
Justin Cormack
3feabca35b Merge pull request #1474 from justincormack/no-riddler
Replace riddler with code that constructs config.json directly
2017-04-03 23:47:02 +01:00
Justin Cormack
065af9707c Replace riddler with code that constructs config.json directly
Generated largely from the specified config; small parts taken from `docker image inspect`,
such as the command line.

Renamed some of the yaml keys to match the OCI spec rather than Docker Compose as
we decided they are more readable, no more underscores.

Add some extra functionality
- tmpfs specification
- fully general mount specification
- no new privileges can be specified now

For nostalgic reasons, using engine-api to talk to the docker cli as
we only need an old API version, and it is nice and easy to vendor...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-03 23:28:55 +01:00
Justin Cormack
40beba49aa Merge pull request #1472 from justincormack/no-ambient
Do not set ambient caps for now
2017-04-03 18:50:16 +01:00
Justin Cormack
47e483fea3 Do not set ambient caps for now
Will make it explicit later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-03 18:39:16 +01:00
Justin Cormack
2a1199eaee Merge pull request #1471 from ijc25/runc-to-match-containerd
Update to runc ef9a4b315558d31eae520725ff67383c2f79c3cb
2017-04-03 18:38:08 +01:00
Ian Campbell
709402d780 Update to runc ef9a4b315558d31eae520725ff67383c2f79c3cb
This is compatible with containerd 8353da59c6ae7e1933aac2228df23541ef8b163f
which was picked up by d2caae4c1a.

This required jiggering with riddler output some more to update to new OCI
config.json format for capabilities.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-04-03 16:47:14 +01:00
thebsdbox
f229e08965 VMware Fusion 8.x / Workstation 12+ / VMware VIX vmrun support
Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
2017-04-03 14:19:13 +01:00
Dave Tucker
6726746484 Add a runner for UEFI ISOs
Fixes #480

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-03 14:13:37 +01:00
Justin Cormack
684ea64c73 Merge pull request #1468 from amirmc/patch-1
Fix minor typos in weekly report
2017-04-03 13:40:40 +01:00
Amir Chaudhry
6ea33853b3 Fix minor typos in weekly report
Signed-off-by: Amir Chaudhry <amir@docker.com>
2017-04-03 13:33:35 +01:00
Justin Cormack
07dc850a73 Merge pull request #1466 from justincormack/ena
Add support for AWS ENA network driver
2017-04-03 12:25:48 +01:00
Justin Cormack
7cb524029c Add support for AWS ENA network driver
This is a new PV style high performance network driver, added to
4.9 kernel, supporting 20Gb, see
http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking.html

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-03 11:14:34 +01:00
Justin Cormack
695e86e181 Merge pull request #1465 from rneugeba/kern-up
kernel: Update to 4.10.8/4.9.20/4.4.59
2017-04-03 11:12:16 +01:00
Rolf Neugebauer
43bd19620f kernel: Update to 4.10.8/4.9.20/4.4.59
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-03 11:05:10 +01:00
Justin Cormack
4220a65128 Merge pull request #1440 from riyazdf/security-arch
Security docs
2017-04-03 10:37:54 +01:00
Riyaz Faizullabhoy
c1f84921fe Address review comments
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-02 21:21:18 -07:00
Rolf Neugebauer
a8ad03feea Merge pull request #1463 from rneugeba/cli
Improve the CLI tool
2017-04-02 22:00:30 +01:00
Rolf Neugebauer
63bdeab660 cli: Add support for passing meta data to a hyperkit VM
Add a -data option to the HyperKit "run" backend. This either
adds a string or a file to a ISO which is attached to the VM.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-02 19:35:45 +01:00
Rolf Neugebauer
ebcf91f19c vendor: Update iso9660wrap
This version adds a function to write a buffer straight to a ISO

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-02 19:35:45 +01:00
Rolf Neugebauer
2a4c0bbf43 cli: Simplify run_hyperkit.go
Separating command line option parsing from executing hyperkit
makes the code awkward with many parameters passed between functions.

Having everything in one function makes the code simpler.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-02 19:33:25 +01:00
Rolf Neugebauer
cbb3ff611f cli: Don't default to "moby" for run
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-02 19:33:25 +01:00
Rolf Neugebauer
eda4c14aa6 cli: Make the ".yml" extension optional for builds
This provides a consistent UX between build and run:
moby build foo   # build from foo.yml
moby run foo     # boot, e.g., foo-bzImage, foo-initrd.img

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-02 19:33:25 +01:00
Rolf Neugebauer
838e4814e4 cli: Don't default to moby.yml
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-02 19:33:25 +01:00
Justin Cormack
bfbac93ef3 Merge pull request #1462 from justincormack/sort-deps
Sort vendor.conf
2017-04-02 18:20:41 +01:00
Justin Cormack
2d81ecfe62 Sort vendor.conf
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-02 18:03:32 +01:00
Thomas Gazagnaire
76b33742ac Merge pull request #1448 from samoht/i-got-an-ip
miragesdk: put the DHCP lease info into the host filesystem
2017-04-02 18:32:51 +02:00
Justin Cormack
0e99c2454c Merge pull request #1461 from justincormack/report-2-april
Add report for 2 April 2017
2017-04-02 16:59:44 +01:00
Justin Cormack
d1031192b3 Add report for 2 April 2017
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-02 16:46:56 +01:00
Justin Cormack
e2ec6c2a93 Merge pull request #1459 from rneugeba/ebpf-fix
docs: Move ebpf.md to projects
2017-04-02 14:04:09 +01:00
Rolf Neugebauer
63c89507e7 docs: Move ebpf.md to projects
This was missed when moving the ebpf stuff into a project.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-02 13:09:29 +01:00