Commit Graph

4032 Commits

Author SHA1 Message Date
Michael Crosby
ae70dc4de1 Merge pull request #870 from estesp/update-email
Update with preferred email address
2017-05-17 11:21:36 -07:00
Phil Estes
d2c0f309d9
Update with preferred email address
Update MAINTAINERS file with my preferred email address as others use
this to send mail, add to mailing lists, etc. My
contributor/Signed-off-by is a valid address, but not the one I use for
community interactions.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-05-17 14:09:15 -04:00
Stephen Day
fae11b6673 Merge pull request #863 from dmcgowan/diff-service
Implementation for diff service
2017-05-16 15:27:21 -07:00
Michael Crosby
cd282f458a Merge pull request #864 from mlaventure/revert-rootfs-error
Revert "Merge pull request #853 from AkihiroSuda/check-rootfs"
2017-05-16 15:05:27 -07:00
Michael Crosby
ce0c802bae Merge pull request #865 from mlaventure/close-stdin-pipe-if-not-requested
Close stdin on create if it wasn't requested and there's no terminal
2017-05-16 15:05:15 -07:00
Kenfe-Mickael Laventure
dd16c0583b Revert "Merge pull request #853 from AkihiroSuda/check-rootfs"
This reverts commit c1530b5b76, reversing
changes made to 3695ba77bb.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-16 14:48:13 -07:00
Kenfe-Mickael Laventure
5523936cf5 Close stdin on create if it wasn't requested and there's no terminal
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-16 14:16:47 -07:00
Derek McGowan
4304da2b58
Delete rootfs when container is deleted
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-05-16 13:48:53 -07:00
Derek McGowan
3ae69c43d8
Add diff service implementation
Add snapshot subcommand to ctr for creating diffs of RW layers.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-05-16 13:48:53 -07:00
Phil Estes
6a7aea6fb1 Merge pull request #860 from mlaventure/exit-shim-on-create-error
Terminate linux shim on create failure
2017-05-16 16:42:51 -04:00
Kenfe-Mickael Laventure
aac425c761 Terminate linux shim on create failure
Since an error is returned via the RPC clients will assume (rightly so)
that a call to the Delete() RPC is not necessary.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-16 13:31:06 -07:00
Kenfe-Mickaël Laventure
47718b0930 Merge pull request #861 from justincormack/go-runc-port
Portability fixes for containerd shim
2017-05-16 12:07:08 -07:00
Derek McGowan
c1530b5b76 Merge pull request #853 from AkihiroSuda/check-rootfs
linux: error out if no rootfs specified
2017-05-16 10:38:25 -07:00
Michael Crosby
3695ba77bb Merge pull request #849 from dmcgowan/snapshot-service
Add snapshot and diff service
2017-05-16 10:35:12 -07:00
Justin Cormack
6a571ecd40 Portability fixes for containerd shim
Update go-runc to master with portability fixes.

Subreaper only exists on Linux, and only Linux runs the shim in a
mount namespace.

With these changes the shim compiles on Darwin, which means the
whole build compiles without errors now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-16 17:13:32 +01:00
Stephen Day
26a62223f3 Merge pull request #858 from stevvooe/remove-fsutils-pkg
fs: remove fsutils package
2017-05-15 16:55:20 -07:00
Derek McGowan
098ff94b24
Add snapshot and diff service
Remove rootfs service in place of snapshot service. Adds
diff service for extracting and creating diffs. Diff
creation is not yet implemented. This service allows
pulling or creating images without needing root access to
mount. Additionally in the future this will allow containerd
to ensure extractions happen safely in a chroot if needed.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-05-15 16:50:16 -07:00
Stephen J Day
320dd70935
fs: remove fsutils package
No need to have a util package under a package... er, package.

We should move most of this functionality to continuity.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-05-15 16:33:58 -07:00
Michael Crosby
a622f5e726 Merge pull request #838 from mlaventure/allow-specifying-shim
Allow specifying shim
2017-05-15 15:42:34 -07:00
Kenfe-Mickael Laventure
f95ad5a280 Don't print the transport closing error for shim events
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-15 15:27:40 -07:00
Kenfe-Mickael Laventure
0457b13043 Allow the shim binary to be specified
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-15 15:27:40 -07:00
Kenfe-Mickael Laventure
ac5563a809 ctr: honor rootfs argument value when generating spec
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-15 15:27:26 -07:00
Kenfe-Mickaël Laventure
615f748e77 Merge pull request #857 from crosbymichael/host
Add --net-host for testing host networking
2017-05-15 15:03:07 -07:00
Michael Crosby
ac98ef7439 Add --net-host for testing host networking
Add `--net-host` to `ctr run` to test containers running in host
networking.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-15 13:41:57 -07:00
Akihiro Suda
7a62734d82 linux: error out if no rootfs specified
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-05-14 14:03:26 +00:00
Phil Estes
7b2bf52f62 Merge pull request #837 from mlaventure/fix-reaper-monitor
Make reaper.Monitor returns an error when exit code is not 0
2017-05-12 16:34:25 -05:00
Michael Crosby
e0e06de707 Merge pull request #843 from estesp/make-without-btrfs
Add buildtag capability to Makefile
2017-05-12 12:56:12 -07:00
Phil Estes
bd432461d3
Shorten no-btrfs build tag name
Remove the `containerd_` portion of the build tag name as it is
unnecessary.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-05-12 09:53:57 -05:00
Phil Estes
385f56b678
Add buildtag capability to Makefile
Add the ability to set buildtags and make note in README.md about the
btrfs build tag to turn off building the btrfs snapshot support.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-05-12 09:53:57 -05:00
Derek McGowan
53296a2fcb Merge pull request #848 from dqminh/fix-typo
remove unused import
2017-05-11 17:56:33 -07:00
Daniel Dao
4b2ce72aaf
remove unused import
With this `make vet` should pass

Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2017-05-11 19:20:00 -05:00
Daniel, Dao Quang Minh
a9be12a52f Merge pull request #847 from dmcgowan/overlay-commit-bug
overlay: call rollback on commit error
2017-05-11 19:17:51 -05:00
Daniel, Dao Quang Minh
6df793797e Merge pull request #846 from crosbymichael/linux-container
Move container and runtime to plugin pkg
2017-05-11 19:07:58 -05:00
Stephen Day
e4945164b0 Merge pull request #776 from AkihiroSuda/introspection
new service: version (WAS: introspection)
2017-05-11 16:49:16 -07:00
Michael Crosby
5a2ad6393f Update windows for plugin interfaces
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-11 16:24:34 -07:00
Derek McGowan
7027e8862a
overlay: call rollback on commit error
Rollback was not being called when the function was called with
a key which does not exist. This failure to call rollback kept
the database open and caused all new requests to block.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-05-11 15:55:47 -07:00
Michael Crosby
a11de50127 Remove LinuxContainer interface
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-11 15:26:26 -07:00
Michael Crosby
466e14aa71 Move errors to plugin pkg
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-11 15:25:26 -07:00
Michael Crosby
01b9f5ec67 Move Container and runtime to plugin pkg
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-11 15:24:12 -07:00
Derek McGowan
fa4e114979 Merge pull request #844 from crosbymichael/revert-darwin
Revert "Only build shim on Linux"
2017-05-11 11:07:29 -07:00
Derek McGowan
47dca20bc7 Merge pull request #841 from justincormack/continuity-up
Further fixes for FreeBSD
2017-05-11 10:58:38 -07:00
Michael Crosby
cc62edb4d6 Revert "Only build shim on Linux"
This reverts commit 296ad66d2d.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-11 10:56:49 -07:00
Justin Cormack
699f846813 Further fixes for FreeBSD
This fixes a lot more issues for FreeBSD, including update for continuity vendor.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-11 10:45:59 +01:00
Akihiro Suda
2562aca1a3 new service: version
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-05-11 09:07:43 +00:00
Michael Crosby
b53105ed25 Merge pull request #821 from stevvooe/content-unify-provider-ingester
content: unify provider and ingester
2017-05-10 17:21:45 -07:00
Stephen J Day
193abed96e
content: unify provider and ingester
The split between provider and ingester was a long standing division
reflecting the client-side use cases. For the most part, we were
differentiating these for the algorithms that operate them, but it made
instantation and use of the types challenging. On the server-side, this
distinction is generally less important. This change unifies these types
and in the process we get a few benefits.

The first is that we now completely access the content store over GRPC.
This was the initial intent and we have now satisfied this goal
completely. There are a few issues around listing content and getting
status, but we resolve these with simple streaming and regexp filters.
More can probably be done to polish this but the result is clean.

Several other content-oriented methods were polished in the process of
unification. We have now properly seperated out the `Abort` method to
cancel ongoing or stalled ingest processes. We have also replaced the
`Active` method with a single status method.

The transition went extremely smoothly. Once the clients were updated to
use the new methods, every thing worked as expected on the first
compile.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-05-10 17:05:53 -07:00
Stephen Day
31cf34b726 Merge pull request #839 from crosbymichael/update-deps
Update deps after move to containerd org
2017-05-10 17:01:51 -07:00
Michael Crosby
23b2b09d13 Update deps after move to containerd org
This updates containerd to use the latest versions of cgroups, fifo,
console, and go-runc from the containerd org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-10 16:51:48 -07:00
Michael Crosby
79e389e549 Merge pull request #836 from crosbymichael/wait-copygroup
Wait for copy routines to be scheduled
2017-05-10 15:54:09 -07:00
Kenfe-Mickael Laventure
ad59eee377 Make reaper.Monitor returns an error when exit code is not 0
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-10 13:18:31 -07:00