Commit Graph

2625 Commits

Author SHA1 Message Date
Rolf Neugebauer
d33892e9f8 cli: Fix "build" when the basename contains a "."
Something like "moby-4.10.yml" did not work when invoked
like "moby build moby-4.10".

While at it, also allow .yaml as an extension.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-06 10:55:18 +01:00
Rolf Neugebauer
fa7c85e235 build: Improve dependency for CLI/infrakit build
Use vendor.conf as a proxy for ./vendor contents

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 23:10:08 +01:00
Rolf Neugebauer
df993d8b0d build: Fix copy&paste error for Infrakit dependencies
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 19:52:31 +01:00
Rolf Neugebauer
466f59189a Merge pull request #1508 from rneugeba/meta
Allow passing LogicalIDs into hyperkit instances
2017-04-05 18:11:12 +01:00
Rolf Neugebauer
df5c858d38 demo: Use IP addresses as Logical IDs in etcd infrakit config
Instead of specifying the number of instances, provide a list
of IP addresses for instances. These are passed to the instance
plugin as LogicalID.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 18:01:52 +01:00
Rolf Neugebauer
ea3bfccf5e infrakit: Fix LogicalID handling in HyperKit plugin
InfraKit may pass an optional LogicalID into an instance. It expects
this LogicalID to be returned via DescribeInstances(). If they don't
match, it assumes something is wrong.

Here, we use the LogicalID passed in (or construct one based on
the internal ID) and stash it in the state directory. It is retrieved
in DescribeInstances().

While at it, also improve logging.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 18:01:52 +01:00
Riyaz Faizullabhoy
a6257844d1 Merge pull request #1506 from justincormack/gcp-indent
Fix indentation in examples/gcp.yml
2017-04-05 09:05:05 -07:00
Justin Cormack
c21996fc0b Fix indentation in examples/gcp.yml
Yaml is fussy...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-05 16:24:03 +01:00
Justin Cormack
4516d360ed Merge pull request #1492 from dave-tucker/gcp
Add gcp backend for moby run
2017-04-05 15:17:01 +01:00
Justin Cormack
50c1bd9df3 Merge pull request #1500 from justincormack/mount-overrides
Allow overriding the default mount options
2017-04-05 15:13:06 +01:00
Justin Cormack
3bffae8fe7 Allow overriding the default mount options
This refactors the mount handling, without changing any defaults.

Any specification of a mount destination will override the default,
so if you want to make `sysfs` read only you can add

```
mounts:
  - type: sysfs
    options: ["ro"]
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-05 15:00:13 +01:00
Dave Tucker
df340fd559 vendor: Add GCP dependencies and update crypto
Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-05 14:50:28 +01:00
Dave Tucker
db10280f5f run: Add gcp backend
This commit implements `moby run gcp` which allows for testing of moby
images on the Google Cloud Platform

This backend attaches (via SSH) to the serial console.
It generates instance-only SSH keys and adds the public key to the
image metadata. These are used by the `moby` tool only.

It will also automatically upload a file and creates an image if the prefix
given to `moby run` is a filename

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-05 14:50:23 +01:00
Dave Tucker
d5a8e23cdd build: Use older GCP API and support service account auth
This commit uses the older GCP API as it supports both compute and
storage. As a result, we can now use either Application Default
Credentials that are generated using the `gcloud` tool or by supplying the
service account credentials in JSON format

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-05 14:50:16 +01:00
Rolf Neugebauer
d50cc4dbeb Merge pull request #1501 from justincormack/ktar
Fix typo that meant modules were missing from image
2017-04-05 13:37:15 +01:00
Justin Cormack
f3a58b04f2 Fix typo that meant modules were missing from image
fix #1393 thanks @deitch

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-05 13:24:42 +01:00
Justin Cormack
3e8e557cda Merge pull request #1496 from justincormack/all-caps
Allow setting capabilities to "all"
2017-04-05 13:04:26 +01:00
Justin Cormack
e2a441be23 Merge pull request #1497 from justincormack/proc-options
Add the standard options Docker sets for /proc
2017-04-05 12:21:52 +01:00
Justin Cormack
297f41e25a Add the standard options Docker sets for /proc
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-05 11:52:17 +01:00
Justin Cormack
0655252add Allow setting capabilities to "all"
This adds every capability. We had this before the OCI changes as we
passed these values to Docker. Makes fully privileged containers less verbose.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-05 11:18:46 +01:00
Rolf Neugebauer
dd58bd75eb Merge pull request #1495 from rneugeba/demo-up
Update demo project
2017-04-05 11:12:28 +01:00
Justin Cormack
59969bcd27 Merge pull request #1494 from ijc25/swarmd-dhcp-container
swarmd: Switch to DHCPD container
2017-04-05 11:11:47 +01:00
Rolf Neugebauer
a131ee823b demo: Update YAML files to include DHCP
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 11:08:48 +01:00
Rolf Neugebauer
1cb8dfc222 demo: Remove infrakit example.
This is superseded by the etcd infrakit setup now in place.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-05 11:07:39 +01:00
Justin Cormack
ef79efee6e Merge pull request #1493 from ijc25/dhcp-oom-score-adj
Update example DHCP containers with oom_score_adj -> oomScoreAdj
2017-04-05 10:54:19 +01:00
Ian Campbell
f01d77930c swarmd: Switch to DHCPD container
Follows on from #1316, copies stanza from moby.yml but also picks up update
from #1493.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-04-05 10:39:04 +01:00
Ian Campbell
decc6b46ff Update example DHCP containers with oom_score_adj -> oomScoreAdj
Looks like this was missed when #1316 was rebased over #1474.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-04-05 10:28:13 +01:00
Justin Cormack
55092ce7f1 Merge pull request #1473 from riyazdf/sign-kernel-img
Sign mobylinux/kernel image on make push
2017-04-04 23:04:57 +01:00
Justin Cormack
b31c601fb1 Merge pull request #1316 from riyazdf/dhcpcd-container
dhcpcd system container
2017-04-04 18:30:56 +01:00
Justin Cormack
bc0feab1c9 Merge pull request #1476 from riyazdf/make-cleaner
Make clean cleaner, and ignore more output disks
2017-04-04 17:23:12 +01:00
Justin Cormack
a97db7b406 Merge pull request #1487 from rneugeba/ik
Update InfraKit
2017-04-04 17:22:44 +01:00
Rolf Neugebauer
8225f34631 Merge pull request #1486 from ijc25/swarmd
swarmd: use standard init
2017-04-04 16:45:05 +01:00
Riyaz Faizullabhoy
53a7e096dd Sign and verify kernel image on make push
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-04 08:33:48 -07:00
Rolf Neugebauer
411a8b2f94 demo: Update etcd README to new InfraKit version
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-04 16:27:15 +01:00
Riyaz Faizullabhoy
a33b9ff4b1 dhcpcd system container
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-04 08:23:47 -07:00
Ian Campbell
8859a7c0a6 swarmd: use standard init
In #1485 I was still using a local mobylinux/init containing #1436, even though
I had included the necessary files in the swarmd container.

Switch to the current standard init package and drop the unnecessary bind.

Also `git add .gitignore` which I forgot last time too.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-04-04 16:23:25 +01:00
Riyaz Faizullabhoy
bba42d2d7e Make clean cleaner, and ignore more output disks
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-04 08:19:20 -07:00
Rolf Neugebauer
110644ac8b infrakit: Update HyperKit plugin to new API
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-04 16:18:21 +01:00
Justin Cormack
08e62e0ebd Merge pull request #1485 from ijc25/swarmd
Initial swarmkit package
2017-04-04 16:09:34 +01:00
Rolf Neugebauer
2ab909fcbd vendor: Update to a new version of InfraKit
This pulls in another slew of other packages.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-04 16:07:53 +01:00
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