dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-07 22:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,043 Commits 33 Branches 333 Tags
cd76c4120ec2d8ec9eb42b0fa2dfd508359bee64
Commit Graph
537 Commits
Author SHA1 Message Date
Michael Crosby d085d9b464 Remove encryption code from containerd core 
We are separating out the encryption code and have designed a few new
interfaces and APIs for processing content streams.  This keep the core
clean of encryption code but enables not only encryption but support of
multiple content types ( custom media types ).

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-09 15:01:16 +00:00
Phil Estes 03d934adc4 Merge pull request #3474 from crosbymichael/uuid 
Add UUID and server info to introspection
 2019-08-06 15:58:05 -04:00
Akihiro Suda 225cc7d5bd Merge pull request #3494 from jterry75/remove_v2 
Completely remove Windows v2 in-tree shim
 2019-08-07 02:19:12 +09:00
Michael Crosby 9f0bc2b53f Add UUID and server info to introspection 
Closes #1862

This adds a new rpc to the introspection service to provide server
information with a generated UUID that is done on demand and the os and
arch of the server.

ctr output:

```bash
> sudo ctr version

Client:
  Version:  v1.2.0-802-g57821695.m
  Revision: 578216950de9c1c188708369e2a31ac6c494dfee.m

Server:
  Version:  v1.2.0-802-g57821695.m
  Revision: 578216950de9c1c188708369e2a31ac6c494dfee.m
  UUID: 92e982a9-f13e-4a2c-9032-e69b27fed454
  OS: linux
  ARCH: amd64
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-06 14:40:48 +00:00
Justin Terry (VM) 4b5dfaee13 Completely remove Windows v2 in-tree shim 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-08-05 16:49:56 -07:00
Lantao Liu a5940da62c Remove ctr cri load and update cri-tools to v1.15.0 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-05 15:22:36 -07:00
Derek McGowan adad947b77 Merge pull request #3460 from lumjjb/ctrrecipients 
Specify protocols in ctr encrypt recipients
 2019-08-01 15:37:40 -07:00
Michael Crosby f543f2fbcd Call CloseIO when stdin closes in ctr 
Fixes #2439

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-07-26 19:52:03 +00:00
Brandon Lum 8cd480c233 Specify protocols in ctr encrypt recipients 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-26 13:20:22 -04:00
Phil Estes 29930e9185 Merge pull request #3455 from dmcgowan/fix-default-import-compression 
Add option to compress blobs on import
 2019-07-25 16:45:11 -04:00
Derek McGowan 02826345cf Add option to compress blobs on import 
Change the default back to leave uncompressed and add
option to do the compression.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-07-25 12:05:38 -07:00
Phil Estes 7ff23438f6 Merge pull request #3452 from lumjjb/keybundles 
Create CryptoConfig constructors to replace dcparameters
 2019-07-25 14:57:59 -04:00
Phil Estes 15b59f9684 Merge pull request #3441 from YLonely/multiple-task-delete 
Update ctr to support deleting multiple tasks at a time
 2019-07-25 14:29:31 -04:00
Brandon Lum 3d1fa69694 Implemented constructors for both encryption and decryption 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-24 22:19:39 -04:00
BoWen Yan 392668d007 ctr:Support deleting multiple tasks at a time 
Signed-off-by: BoWen Yan <loneybw@gmail.com>
 2019-07-25 09:59:15 +08:00
Phil Estes fdab4f4789 Merge pull request #3446 from stefanberger/cleanup 
Wrap creation of CryptoConfig in constructors
 2019-07-24 14:46:13 -04:00
Stefan Berger 364de4c35d Wrap creation of CryptoConfig in constructors 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
 2019-07-23 19:53:23 -04:00
Michael Crosby f055bdb0aa Remove windows v1 runtime 
Closes #3094

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-07-23 18:54:37 +00:00
Derek McGowan f7761411b8 Merge pull request #3424 from crosbymichael/devices 
Add linux device options and --devices flag to ctr
 2019-07-22 16:39:02 -07:00
Brandon Lum c6d437fd70 Corrected lease implementation 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-18 18:17:20 -04:00
Michael Crosby 725d3ad8cb Add --device flag to ctr 
Closes #3066

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-07-18 18:51:05 +00:00
Wei Fu 283d5d9005 Merge pull request #3418 from stevvooe/backout-error-changes 
errors: use errdefs errors in client and commands
 2019-07-17 21:32:52 -04:00
Stephen Day 804ae89be6 errors: use errdefs errors in client and commands 
This change moves from specific, global errors to the errdefs errors.
This makes it easy to handle certain classes of errors while still
adding context to the failure.

Signed-off-by: Stephen Day <stephen.day@getcruise.com>
 2019-07-17 13:42:28 -07:00
Derek McGowan dde436e65b Crypto library movement and changes to content helper interfaces 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-07-17 15:21:29 -04:00
Stefan Berger bf8804c743 Implemented image encryption/decryption libraries and ctr commands 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2019-07-17 15:19:58 -04:00
Phil Estes d6be45e151 Merge pull request #3416 from crosbymichael/hard-code-err 
Replace hard coded error messages
 2019-07-15 17:14:59 -04:00
Michael Crosby 61d930ad5b Move specific errors to their respective packages 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-07-15 20:21:11 +00:00
Phil Estes 82826df9bd Small refactor due to CI linter changes 
Without the open variable in use, no reason to define it or use it as the
for loop control.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-07-15 10:43:31 -07:00
Michael Crosby f3e148b1cc Merge pull request #3411 from mxpv/linter 
Switch from gometalinter to golangci-lint
 2019-07-15 10:58:59 -04:00
Maksym Pavlenko ef7f46eb7b Fix linter errors 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-07-14 20:49:40 -07:00
Fahed Dorgaa abc152d14c fix name in containers file 
Signed-off-by: Fahed Dorgaa <fahed.dorgaa@gmail.com>
 2019-07-14 21:49:07 +02:00
Peng Wang 4988424fc0 * fix: view snapshot is deleted before diff 
Signed-off-by: Peng Wang <wang_peng168@163.com>
 2019-07-14 07:06:04 -04:00
Fahed Dorgaa db95af43f3 centralize harded-code message 
Signed-off-by: Fahed Dorgaa <fahed.dorgaa@gmail.com>
 2019-07-13 15:07:23 +02:00
Maksym Pavlenko 1918ee4d11 Respect default snapshotter label 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-07-10 12:16:43 -07:00
Maksym Pavlenko 4e2fc81edd Add aliases to namespaces subcommand 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-07-10 12:10:14 -07:00
Eli Uriegas af93e4009b ctr: Add images tag subcommand 
Adds a subcommand for tagging images managed by containerd.

Usage:

  ctr images tag docker.io/library/alpine:latest docker.io/library/alpine:new

Comes with a --force flag to allow you to gracefully overwrite image references
that already exist.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2019-07-06 15:44:17 +00:00
Michael Crosby 876c8890ae Merge pull request #3384 from mxpv/exec-log-uri 
Support --log-uri in exec subcommand
 2019-07-02 14:34:13 -04:00
Maksym Pavlenko 46af8ccd2d Check exec log flags compatibility 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-07-02 09:53:11 -07:00
Maksym Pavlenko 6b59b425e2 Support --log-uri for exec subcommand 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-07-01 13:32:37 -07:00
Michael Crosby 844c58102e Add cgroup delete opt for ns deletion 
Closes #3305

This adds an opt and a `--cgroup,-c` flag to `ctr namespaces rm` to
remove the cgroup that is commonly created with runtimes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-07-01 15:01:02 -04:00
Derek McGowan a274dbe822 Fix run with specified platform 
Adds the platform flag to the run command and resolves
the image based on that platform.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-05-23 11:59:33 -07:00
Phil Estes b99a66c267 Merge pull request #3288 from Ace-Tang/easy-shim 
ctr: make ctr shim command easy to use
 2019-05-17 15:40:39 +02:00
Wei Fu e61f7f4913 Merge pull request #3172 from dmcgowan/export-docker-compatibility 
Update image export to support Docker format
 2019-05-17 14:30:54 +08:00
Ace-Tang 6907062863 ctr: make ctr shim command easy to use 
make ctr shim command easy to use for user, shim socket is generated
through sha256, and it can not get directly, change socket flag to id
command, generated socket in code.
It also avoid fail to connect shim v2, since shim v2 have multiple
containers, `ctr shim --socket state` should specify container id, or
get error `rpc error: code = NotFound desc = container not created: not
found`

Signed-off-by: Ace-Tang <aceapril@126.com>
 2019-05-17 11:56:08 +08:00
Michael Crosby 67b45aef49 Add WithoutRefreshed metadata 
Closes #2566

This provides faster lookups and lists for ctr commands.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-05-10 15:16:14 +00:00
Michael Crosby bd27bef4ad Move checkpoint and restore commands to new files 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-05-10 14:20:19 +00:00
Phil Estes d71c7ada27 Merge pull request #3259 from BenTheElder/no-unpack 
ctr images import: add --no-unpack option
 2019-05-05 12:29:45 -07:00
Benjamin Elder cb7c780af2 ctr images import: add --no-unpack option 
Signed-off-by: Benjamin Elder <bentheelder@google.com>
 2019-05-01 17:09:30 -07:00
Davor Kapsa cfc36388b3 Remove redundant error checks 
Signed-off-by: Davor Kapsa <davor.kapsa@gmail.com>
 2019-04-30 21:28:51 +02:00
Derek McGowan 4754d2aeee Update image export to support Docker format 
Add manifest.json file which is used by Docker
to import images.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-04-04 15:23:06 -07:00