Commit Graph

11956 Commits

Author SHA1 Message Date
Lantao Liu
1f3a73d79e Merge pull request #72 from Random-Liu/add-exec-sync
Add ExecSync.
2017-06-16 16:58:50 -07:00
Michael Crosby
60c08fa386 Don't log AlreadyExists errors
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-16 16:39:52 -07:00
Michael Crosby
ecbc779209 Handle start process errors in reaper
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-16 16:03:13 -07:00
Michael Crosby
7e3b7dead6 Merge pull request #1022 from stevvooe/add-pull-support-for-manifest-list
image: add support for pulling manifest lists/oci indexes
2017-06-16 15:29:28 -07:00
Lantao Liu
9b79201aa5 Add ExecSync.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 22:28:48 +00:00
Michael Crosby
e4dd5ce835 Merge pull request #1024 from stevvooe/correctly-flushing
cmd/{dist, ctr}: cleanup flushing and alignment
2017-06-16 15:03:57 -07:00
Stephen J Day
5a124794ae
image: add support for pulling manifest lists/oci indexes
This PR ensures that we can pull images with manifest lists, aka OCI
indexes. After this change, when pulling such an image, the resources
will all be available for creating the image.

Further support is required to do platform based selection for rootfs
creation, so such images may not yet be runnable. This is mostly useful
for checkpoint transfers, which use an OCI index for assembling the
component set.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-06-16 14:59:35 -07:00
Stephen J Day
5d13f8027c
cmd/{dist, ctr}: cleanup flushing and alignment
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-06-16 14:49:48 -07:00
Michael Crosby
4f20689d37 Merge pull request #1020 from chanezon/master
retrying pr for website to satify cncf guidelines
2017-06-16 14:39:25 -07:00
Patrick Chanezon
16f04383ae retrying pr for website to satify cncf guidelines
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>

fixing validation issue for whitespace

Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
2017-06-16 14:30:31 -07:00
Stephen Day
b4b16a1d45 Merge pull request #1016 from crosbymichael/servicefile
Add containerd unit file
2017-06-16 14:30:20 -07:00
Stephen Day
751bd54c89 Merge pull request #1021 from crosbymichael/with-image
Set image on rootfs options
2017-06-16 14:12:17 -07:00
Michael Crosby
0bc86860f0 Add containerd unit file
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-16 14:05:16 -07:00
Lantao Liu
9658159534 Merge pull request #77 from Random-Liu/unmount-dev-shm
Unmount dev shm and cleanup container when stop/remove sandbox
2017-06-16 13:59:47 -07:00
Michael Crosby
79631498af Set image on rootfs options
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-16 13:51:24 -07:00
Michael Crosby
d922f48735 Merge pull request #1006 from dmcgowan/content-writer-exists
Content store writer checks expected
2017-06-16 13:29:07 -07:00
Lantao Liu
57b8b4358d Update godeps.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 17:19:34 +00:00
Lantao Liu
53367bbd14 Stop/remove all containers when stop/remove sandbox.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 17:19:19 +00:00
Lantao Liu
7f9e0262ad Unmount /dev/shm when stop sandbox.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 17:18:14 +00:00
Lantao Liu
cc43c86f86 Merge pull request #78 from Random-Liu/switch-to-new-containerd-client
Switch to new containerd api
2017-06-16 09:56:54 -07:00
Lantao Liu
d6435996e2 Use new Kill task api.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 16:43:13 +00:00
Lantao Liu
5b7cbf1bc6 Create/remove sandbox container.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 16:43:13 +00:00
Lantao Liu
cb9e104cf1 Create/delete containerd containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 16:43:13 +00:00
Lantao Liu
6ca9c65578 Rename more container to task.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 02:34:43 +00:00
Lantao Liu
bad279e0f6 Finish snapshot support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 02:34:43 +00:00
Michael Crosby
6c4a2691b3 Don't delete container with task
Make sure we don't delete a container with a live task

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-15 16:37:50 -07:00
Mike Brown
484a326717 modify code to compile on updated containerd
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-06-15 23:14:21 +00:00
Mike Brown
67e884e6cf update containerd to 4ae34cccc5.
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-06-15 23:14:21 +00:00
Michael Crosby
9d155e8164 Merge pull request #1015 from crosbymichael/benchmark
Benchmark container create and task start
2017-06-15 16:07:32 -07:00
Michael Crosby
268ab7c053 Benchmark container create and task start
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-15 10:43:59 -07:00
Phil Estes
f2963f7562 Merge pull request #1012 from miaoyq/add-format-description-for-ctr-info
Add 'ArgsUsage' for ctr sub-cmds
2017-06-15 11:12:53 -04:00
Kenfe-Mickaël Laventure
40fbd282cc Merge pull request #1014 from ijc/log-when-skipping-a-plugin
Do not claim to be loading a plugin which we aren't.
2017-06-15 07:31:46 -07:00
Daniel, Dao Quang Minh
05cfd0e8d3 Merge pull request #1011 from AkihiroSuda/godoc
README.md: add GoDoc badge
2017-06-15 14:32:59 +01:00
Phil Estes
5e65d62ed9 Merge pull request #968 from dmcgowan/pull-schema-1
Add schema1 conversion on pull
2017-06-15 09:15:17 -04:00
Ian Campbell
66b7f8d79f Do not claim to be loading a plugin which we aren't.
I had forgotten to update my config.toml after #994 and was very confused by:

INFO[0000] starting containerd boot...                   module=containerd
INFO[0000] starting debug API...                         debug="/run/containerd/debug.sock" module=containerd
INFO[0000] loading plugin "io.containerd.content.v1.content"...  module=containerd type=io.containerd.content.v1
INFO[0000] loading plugin "io.containerd.snapshotter.v1.btrfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] loading plugin "io.containerd.snapshotter.v1.overlayfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] loading plugin "io.containerd.differ.v1.base-diff"...  module=containerd type=io.containerd.differ.v1
containerd: no plugins registered for io.containerd.snapshotter.v1

Where apparently two candidates for io.containerd.snapshotter.v1 had been
loaded but the error claimed (correctly, it turns out) that none were. With
this change instead I see:

INFO[0000] starting containerd boot...                   module=containerd
INFO[0000] starting debug API...                         debug="/run/containerd/debug.sock" module=containerd
INFO[0000] loading plugin "io.containerd.content.v1.content"...  module=containerd type=io.containerd.content.v1
INFO[0000] skipping plugin "io.containerd.snapshotter.v1.btrfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] skipping plugin "io.containerd.snapshotter.v1.overlayfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] loading plugin "io.containerd.differ.v1.base-diff"...  module=containerd type=io.containerd.differ.v1
containerd: no plugins registered for io.containerd.snapshotter.v1

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-15 14:04:56 +01:00
Akihiro Suda
490530be04 README.md: add GoDoc badge
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-15 08:08:17 +00:00
Yanqiang Miao
b88b53212f Add 'ArgsUsage' for some ctr sub-cmds
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-06-15 16:04:11 +08:00
Derek McGowan
c215531a8f Merge pull request #994 from crosbymichael/bundles
Setup plugin ids and dependencies
2017-06-14 17:03:46 -07:00
Derek McGowan
64bc516bbe
Add with block and fail on non-temp dial error
This guarantees that grpc requests will fail quickly
when the service is not started or does not have permission.
Without the fail on non-temp error the withblock will
cause the client to wait until the timeout before failing.

Fixes #989

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-14 16:50:37 -07:00
Michael Crosby
94e7f8e943 Setup plugin ids and dependencies
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-14 16:17:20 -07:00
Derek McGowan
38c3cc71de
Content store writer checks expected
Fixes #1004

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-14 14:54:13 -07:00
Lantao Liu
d4f7380f59 Merge pull request #73 from Random-Liu/fix-delete-race
Fix Delete race.
2017-06-14 14:04:24 -07:00
Lantao Liu
0e2db7e99a Merge pull request #76 from Random-Liu/fix-fake-execution-client-race
Fix a race that fake execution client sends event to closed channel.
2017-06-14 14:02:00 -07:00
Derek McGowan
6bbed2c125 Merge pull request #1003 from crosbymichael/gprc-metrics
Register grpc metrics in main
2017-06-14 13:04:59 -07:00
Phil Estes
e10a9aff7d
Use error interfaces for content/metadata
These interfaces allow us to preserve both the checking of error "cause"
as well as messages returned from the gRPC API so that the client gets
full error reason instead of a default "metadata: not found" in the case
of a missing image.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-06-14 15:55:08 -04:00
Michael Crosby
f5c587c1f7 Merge pull request #1002 from mlaventure/runtime-error-bubble
Bubble up linux runtime errors
2017-06-14 12:25:25 -07:00
Kenfe-Mickael Laventure
c9064df2cf
Discard grpc logs by default
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-14 11:58:13 -07:00
Derek McGowan
8ed1e24ae9
Add blob state calculation to handle empty ambiguity
The size and throwaway fields in the history can bother be
omitted, making the emptiness of a layer ambiguous. In these
cases download and check whether the content is empty.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-14 11:53:52 -07:00
Michael Crosby
c2dd40c9bc Register grpc metrics in main
This needs to be registered last after all other services have been
registred.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-14 11:19:58 -07:00
Michael Crosby
9b8e76edf1 Merge pull request #929 from AkihiroSuda/ociimage
package for manipulating OCI images
2017-06-14 10:50:16 -07:00