Commit Graph

2889 Commits

Author SHA1 Message Date
Justin Cormack
fb5d6a8fad Add an (empty) config file for containerd
It needs one now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-08 21:38:31 +01:00
Justin Cormack
c40351a0a8 Make each rootfs a mountpoint by binding
Otherwise shared mounts do not work correctly with `runc`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-08 21:10:30 +01:00
Rolf Neugebauer
508f12350a Merge pull request #1547 from rneugeba/demo-up
Update etcd demo
2017-04-08 20:49:38 +01:00
Rolf Neugebauer
875cb565e3 demo: Update etcd README
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-08 20:38:53 +01:00
Rolf Neugebauer
31a4156686 demo: Add formatting and mounting to etcd image
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-08 20:38:53 +01:00
Rolf Neugebauer
a3d20abdb6 demo: Add a disk to the etcd image
etcd works better with a persistent storage. So configure a
disk and add the formatting container to the image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-08 20:38:53 +01:00
Rolf Neugebauer
6407cf360b demo: Update YAML files to new init section layout
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-08 20:37:17 +01:00
Rolf Neugebauer
eeae23e9de infrakit: Create persistent disk if an InstanceID is provided
If the user specifies an InstanceID, we assume the instance is "named"
and, therefore, special. If the instance has a disk configured, create
it in the "disks" directory so that, if the same instance is recreated,
the disk image can be re-used.

This is consistent with other InfraKit plugins.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-08 20:32:25 +01:00
Rolf Neugebauer
b5dd0315e2 demo: Make sure the infrakit 'cli' directory exists
Otherwise there is a warning on first use.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-08 20:32:25 +01:00
Justin Cormack
3fca3823a7 Merge pull request #1549 from justincormack/onboot-services
system → onboot,  daemon → services
2017-04-08 20:06:08 +01:00
Justin Cormack
2f7f274147 Merge pull request #1534 from justincormack/yaml-doc
Add initial overview of the yaml config
2017-04-08 20:05:35 +01:00
Justin Cormack
aa3e6fdc9f Add initial overview of the yaml config
Needs expanding with more details, but a start.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-08 17:14:07 +01:00
Justin Cormack
eb22d6909f system → onboot daemon → services
As suggested by @shykes these are clearer

- onboot for things that are run at boot time to completion
- services for persistent services

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-08 16:56:47 +01:00
Justin Cormack
5956f7203a Merge pull request #1548 from errordeveloper/debugging-with-ssh
Make sshd example usefull for debugging
2017-04-08 15:36:14 +01:00
Ilya Dmitrichenko
a3638a2b8f Make sshd example usefull for debugging
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2017-04-08 12:49:51 +01:00
Justin Cormack
ff009335a2 Merge pull request #1512 from riyazdf/content-trust-enforcement
Content Trust enforcement on pull and run where specified for kernel
2017-04-08 10:07:06 +01:00
Justin Cormack
06ea4620d3 Merge pull request #1546 from errordeveloper/minor-updates
Minor updates
2017-04-08 10:04:28 +01:00
Justin Cormack
d889c554ca Merge pull request #1545 from RobbKistler/target-consistency
Change hyperkit-test to test-hyperkit
2017-04-08 10:02:08 +01:00
Ilya Dmitrichenko
54835a1d67 Fix typo
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2017-04-08 05:53:31 +01:00
Ilya Dmitrichenko
12d6e38b48 Use directory: true instead fo writing a dummy file
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2017-04-08 05:53:22 +01:00
Robb Kistler
99e1643c82 Change hyperkit-test to test-hyperkit
Other test targets are all `test-*`, should be consistent

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-04-07 19:04:36 -07:00
Riyaz Faizullabhoy
a947ded0fb Enforce content trust with trust key and yaml subkeys for image and org
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-04-07 16:29:25 -07:00
Justin Cormack
d15a4e7370 Merge pull request #1541 from justincormack/no-make-h
Remove running instructions using make
2017-04-07 20:42:26 +01:00
Justin Cormack
6f40af776e Merge pull request #1542 from justincormack/runc-containerd-split
Split out init to have standalone runc, containerd
2017-04-07 17:01:25 +01:00
Justin Cormack
a54a694772 Split out init to have standalone runc, containerd
Also add ca-certificates to base, needed to use `dist` to pull.

Make two stage builds for `containerd` and `runc` so they have a
from `scratch` second stage.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-07 16:25:18 +01:00
Justin Cormack
24493812b1 Remove running instructions using make
These no longer work.

Needs updating once `qemu` support merged.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-07 16:13:55 +01:00
Justin Cormack
6c748747d2 Merge pull request #1535 from dave-tucker/make
Allow CI to use moby run gcp
2017-04-07 16:03:46 +01:00
Rolf Neugebauer
69294dd41f Merge pull request #1540 from rneugeba/demo2
Flushing my demo queue
2017-04-07 16:03:19 +01:00
Rolf Neugebauer
4520daa753 demo: Updated docs and added socat forwarding container
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-07 15:43:03 +01:00
Rolf Neugebauer
57f41c4b5a demo: Update YAMLS files
New init for RO filesystem, updated DHCPD

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-07 15:43:03 +01:00
Rolf Neugebauer
f718d4195f demo: Add URL to modified VPNKit
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-07 15:43:03 +01:00
Rolf Neugebauer
f0961b8897 demo: Add a dockerfile to run etcdctl agains the local cluster
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-07 15:43:03 +01:00
Rolf Neugebauer
c660ca5ac4 demo: Create a cluster of 5 etcd daemons
Also tweak the shell script a little and give the local and GCP
infrakit group different names.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-07 15:43:03 +01:00
Rolf Neugebauer
9878cabd1e demo: Add script to start infrakit
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-04-07 15:43:02 +01:00
Dave Tucker
e2da49c7e2 moby: Add -img-name flag to moby run gcp
This allows overriding the name used of the file in google storage,
image name or instance name. This will vary depending on how much `moby
run` is doing which is goverened by whether the positional argument
contains an `.img.tar.gz` or not.

For example:

`moby run gcp -img-name test-ea34d1 test` creates an instance called
`test-ea34d1` from the image `test`

`moby run gcp -img-name test-ea34d1` test.img.tar.gz` will upload the
file as `test-ea34d1.tar.gz`, create image `test-ea34d1` and create an
instance called `test-ea34d1`.

The use case for this is for CI to be able to spawn many concurrent test
machines and provide it's own name for them.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-07 15:35:54 +01:00
Justin Cormack
f46881c1a1 Merge pull request #1538 from justincormack/go-get
Simplify the instructions if you already have Go installed
2017-04-07 15:31:56 +01:00
Dave Tucker
c50e0de0c1 moby: Allow combination of env vars and flags for gcp
Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-07 15:22:27 +01:00
Dave Tucker
a4980c8bfb makefile: Add targets to test GCP
Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-07 15:22:12 +01:00
Dave Tucker
fddfd0b3ec makefile: Allow a bin/moby to be provided
This is needed for CI to be able to run `moby run $platform` with a
known good version of moby. For example, the one generated when building
the `master`.

This protects CI from any nefarious changes to the `moby` tool and
allows `moby run` to be used safely to test PRs.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-04-07 15:20:35 +01:00
Justin Cormack
958dd89891 Simplify the instructions if you already have Go installed
Most use cases can just do `go get`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-07 15:03:39 +01:00
Justin Cormack
9553bbf514 Merge pull request #1536 from justincormack/fewer-targets
Remove Makefile targets that build `moby.yml`
2017-04-07 15:02:35 +01:00
Justin Cormack
6dc0ee4748 Remove Makefile targets that build moby.yml
Its trivial to just do `bin/moby build moby` etc.

Just leaving test targets, which should really move
out of root later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-07 14:54:41 +01:00
Justin Cormack
90aeb44721 Merge pull request #1537 from justincormack/init-list
Make `init` accept a list of images not just a single one.
2017-04-07 14:42:29 +01:00
Justin Cormack
d9faecdee9 Make init accept a list of images not just a single one.
fix #1527

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-07 14:25:28 +01:00
Justin Cormack
8d0bc4c3c6 Merge pull request #1533 from justincormack/incremental-initrd
Write the initrd incrementally
2017-04-07 14:04:22 +01:00
Justin Cormack
4663fcca2b Write the initrd incrementally
Slightly better for demo flow as no long pause at the end

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-07 11:37:40 +01:00
Justin Cormack
aa17afaede Merge pull request #1532 from samoht/less-caps
miragesdk: remove CAP_SYS_PTRACe
2017-04-07 11:23:57 +01:00
Thomas Gazagnaire
81debfcd74 miragesdk: update README with moby build/run instructions
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-04-07 12:13:06 +02:00
Thomas Gazagnaire
914d27bed9 miragesdk: remove CAP_SYS_PTRACE
Since https://github.com/opencontainers/runc/pull/774 we don't need this anymore.

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-04-07 12:10:35 +02:00
Thomas Gazagnaire
d289de6416 miragesdk: update to latest runc
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-04-07 12:10:35 +02:00