Commit Graph

2162 Commits

Author SHA1 Message Date
Lantao Liu
debd07fc13 Minor typo fix.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-10 06:23:21 +00:00
Stephen Day
e6ba48f25c Merge pull request #1257 from stevvooe/content-changes
content: remove Provider.Reader
2017-08-09 17:12:44 -07:00
Stephen J Day
8be340e37b
content: remove Provider.Reader
After some analysis, it was found that Content.Reader was generally
redudant to an io.ReaderAt. This change removes `Content.Reader` in
favor of a `Content.ReaderAt`. In general, `ReaderAt` can perform better
over interfaces with indeterminant latency because it avoids remote
state for reads. Where a reader is required, a helper is provided to
convert it into an `io.SectionReader`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-09 14:32:28 -07:00
Phil Estes
f3ff1e223b Merge pull request #1315 from crosbymichael/lchown
Use lchown when remapping rootfs
2017-08-09 11:36:10 -04:00
Michael Crosby
1f6b10b699 Use lchown when remapping rootfs
Use lchown when remapping the container's rootfs as to ensure that the
symlink has the correct permissions but the underlying file that it
points to is not modified.

Remapping on the host can cause host files to change outside of the
rootfs if symlinks are dereferenced.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-09 11:27:46 -04:00
Phil Estes
ef344c14ba Merge pull request #1312 from tklauser/use-x-sys
Use functions from golang.org/x/sys
2017-08-09 10:30:37 -04:00
Tobias Klauser
f2bed8ffb9 Use CopyFileRange from golang.org/x/sys/unix
Use the CopyFileRange and Lsetxattr from golang.org/x/sys/unix instead
of their counterparts from github.com/containerd/continuity/sysx. These
are 1:1 replacements (except for the fd parameter types in
CopyFileRange).

This will eventually allow to remove these functions there as well.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-08-09 13:43:12 +02:00
Tobias Klauser
4a6a2b9db0 Switch from package syscall to golang.org/x/sys
The syscall package is locked down and the comment in [1] advises to
switch code to use the corresponding package from golang.org/x/sys. Do
so and replace usage of package syscall with package
golang.org/x/sys/{unix,windows} where applicable.

  [1] https://github.com/golang/go/blob/master/src/syscall/syscall.go#L21-L24

This will also allow to get updates and fixes for syscall wrappers
without having to use a new go version.

Errno, Signal and SysProcAttr aren't changed as they haven't been
implemented in x/sys/. Stat_t from syscall is used if standard library
packages (e.g. os) require it. syscall.ENOTSUP, syscall.SIGKILL and
syscall.SIGTERM are used for cross-platform files.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-08-09 13:41:16 +02:00
Michael Crosby
29a4dd7f46 Merge pull request #1276 from dmcgowan/snapshot-labels
Snapshot labels
2017-08-08 21:59:28 -04:00
Phil Estes
ee027d4e4b Merge pull request #1309 from crosbymichael/opts-doc
Add doc for extending client opts
2017-08-08 17:33:39 -04:00
Michael Crosby
67572b6370 Merge pull request #1307 from crosbymichael/spec-opts
Add cgroup paths and hostname spec opts
2017-08-08 16:58:04 -04:00
Michael Crosby
bed8df119e Add cgroup paths and hostname spec opts
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-08 15:52:56 -04:00
Michael Crosby
1907116bdd Add doc for extending client opts
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-08 15:39:59 -04:00
Michael Crosby
1f04eddad1 Merge pull request #1306 from estesp/error-no-container
Delete command should require at least one container ID
2017-08-08 11:29:56 -04:00
Phil Estes
8ebbd1cdf9
Delete command should require at least one container ID
Also fix help/usage to reveal delete accepts multiple container IDs.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-08-08 11:13:23 -04:00
Phil Estes
42c1c9a990 Merge pull request #1301 from crosbymichael/task-force
Add WithProcessKill DeleteOpt
2017-08-08 10:48:28 -04:00
Michael Crosby
d8c075aadc Add WithProcessKill DeleteOpt
Add an option that allows users for force kill and delete a process/task
when calling `Delete`

Fixes #1274

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-08 10:37:17 -04:00
Michael Crosby
d4be9822ed Merge pull request #1303 from estesp/cleanup-workdir
Fix bundle removal with the reappearance of state dir
2017-08-08 10:19:29 -04:00
Stephen Day
a2add74524 Merge pull request #1302 from dmcgowan/fix-blob-by-tag-attempt
pull: avoid attempting blobs endpoint when digest is not provided
2017-08-07 17:29:10 -07:00
Phil Estes
c8cd3d9080
Fix bundle removal with the reappearance of state dir
Bundle removal now requires removing both workdir and path locations on
delete in shim.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-08-07 17:50:22 -04:00
Derek McGowan
2b0aa29c7d
Avoid attemping blobs endpoint when digest is not provided
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-07 13:55:47 -07:00
Derek McGowan
738c22a756 Merge pull request #1299 from crosbymichael/ctr
Update ctr containers and tasks command
2017-08-07 13:32:03 -07:00
Phil Estes
cdd03c983f Merge pull request #1300 from crosbymichael/ops
Add Ops/Admin Guide to containerd
2017-08-07 16:27:53 -04:00
Michael Crosby
2fb2168bae Merge pull request #1224 from epilatow/solaris.cc.20170719.0
Add solaris build support
2017-08-07 16:15:07 -04:00
Edward Pilatowicz
56c1f5c184 Add solaris build support
Signed-off-by: Edward Pilatowicz <edward.pilatowicz@oracle.com>
2017-08-07 12:40:21 -07:00
Michael Crosby
00288bcb58 Update ctr containers and tasks command
This moves container and tasks commands under the containers and tasks
top level commands.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-07 14:45:21 -04:00
Michael Crosby
a543d05708 Add ops guide for containerd
This adds an explaination to some of the config file settings and what
the accomplish in containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-07 14:41:27 -04:00
Michael Crosby
f2ba04ffa4 Set subreaper true in default linux config
This sets the subreaper to true in the default linux config as the
common usecase is to not run containerd as pid 1.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-07 14:40:26 -04:00
Phil Estes
e9b86af848 Merge pull request #1283 from mlaventure/resurrect-state-dir
Resurrect State directory
2017-08-07 10:41:21 -04:00
Phil Estes
fc9410888f Merge pull request #1294 from crosbymichael/gettingstarted
Add getting started guide
2017-08-07 10:36:17 -04:00
Michael Crosby
b20fd92a13 Merge pull request #1298 from miaoyq/add-start-cmd
Add `start` subcommand in `ctr`.
2017-08-07 10:21:35 -04:00
Michael Crosby
60f7eee27b Merge pull request #1275 from mlaventure/travis-ineffassign
Enable ineffassign in CI
2017-08-07 09:21:53 -04:00
Michael Crosby
a88397e9f6 Merge pull request #1296 from stevvooe/api-stability-tooling
api: generate merged descriptors when building protobufs
2017-08-07 09:19:11 -04:00
Michael Crosby
d6c171ea89 Add getting started guide
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-07 09:17:27 -04:00
Yanqiang Miao
ac72bbab26 Add start subcommand in ctr.
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-05 09:39:11 +08:00
Stephen J Day
a73eb2b2ce
api: generate merged descriptors when building protobufs
When we generate protobufs, descriptors outlining all messages and
services are merged into a single file that can be used to identify
unexpected changes to the API that may affect stability. We follow a
similar process to Go's stability guarantees using the protobuf
descriptors to identify changes before they become a problem.

Please see README.md for details.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-04 16:50:28 -07:00
Stephen Day
e8625bcdfb Merge pull request #1295 from mlaventure/separate-client-opts
Move client's options to separate files
2017-08-04 14:11:48 -07:00
Michael Crosby
de7afd8aa8 Merge pull request #1293 from dmcgowan/fix-snapshotter-run
Fix ctr run bug when snapshotter is provided
2017-08-04 17:07:49 -04:00
Kenfe-Mickael Laventure
56b18c1d1f
Move client's options to separate files
This should help in discovering the available options for a given object.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-04 13:56:16 -07:00
Derek McGowan
5a74a46d42
Fix bug where snapshots got created with wrong snapshotter
Snapshotters for run must be created with requested snapshotter.
The order of the options is important to ensure that the snapshotter
is set before the snapshots are created.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-04 13:32:33 -07:00
Derek McGowan
6c1a04f3a4 Merge pull request #1292 from stevvooe/cleanup-protobuf-imports
api: cleanup protobuf imports
2017-08-04 13:21:27 -07:00
Kenfe-Mickaël Laventure
bf913547f8 Merge pull request #1290 from Random-Liu/cleanup-io-properly
Cleanup FIFOs on error.
2017-08-04 22:02:24 +02:00
Stephen J Day
d986a187d7
api: cleanup protobuf imports
There were a few files printing warnings during the build due to
erroneous imports. These imports have now been removed.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-04 12:57:43 -07:00
Lantao Liu
73735c4dba Cleanup FIFOs on error.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-04 18:58:10 +00:00
Phil Estes
bb39d1d982 Merge pull request #1289 from mlaventure/add-missing-return
Add missing return when failing to write tar header
2017-08-04 13:50:21 -04:00
Kenfe-Mickael Laventure
308ebe7e43
Add missing return when failing to write tar header
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-04 10:41:38 -07:00
Derek McGowan
99315f8e02 Merge pull request #1285 from crosbymichael/client-godoc
Update godoc for client package
2017-08-04 10:38:53 -07:00
Michael Crosby
bce8fe7bf7 Merge pull request #1288 from mlaventure/dont-touch-grpclog-in-client
Do not touch grpc logger from within the packages
2017-08-04 13:31:07 -04:00
Kenfe-Mickaël Laventure
2eaf91177d Merge pull request #1279 from Random-Liu/cancel-context-on-wait
Cancel event subscribe context in Wait.
2017-08-04 19:18:30 +02:00
Kenfe-Mickael Laventure
16f6e0944a
Do not touch grpc logger from within the packages
Libraries should not make process wide changes unless requested to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-04 10:11:46 -07:00