Commit Graph

11497 Commits

Author SHA1 Message Date
Derek McGowan
432670237c
Fix race in gc sweep
Removes extra goroutine and calls removal and scan in same thread

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-30 13:56:16 -07:00
Jess Valarezo
e4da49c44c ctr: move unpack to snapshot command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 13:23:36 -07:00
Jess Valarezo
456d3f4475 ctr: move push and pull to images command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 13:23:36 -07:00
Jess Valarezo
b58e4fc2ed ctr: move fetch,fetch-object,push-object to content
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 13:23:06 -07:00
Stephen Day
e2f9fbfe71
Merge pull request #1687 from crosbymichael/pie
Add buildmode=pie to makefile
2017-10-30 12:02:34 -07:00
Michael Crosby
91597bc6c3 Move task list to separate command
This keeps the semantics the same as the other commands to only list
containers, tasks, images by calling the list subcommand.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-30 15:01:00 -04:00
Phil Estes
58835d2edc
Merge pull request #1697 from crosbymichael/template
Add template filepath for release tool
2017-10-30 13:43:25 -04:00
Michael Crosby
adc502b790 Add template filepath for release tool
This allows a project to have a TEMPLATE file in the root of the repo to
be used with the release tool.  If they don't have this file and did not
specify a custom file then it will use the compiled in template in the
release tool.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-30 13:15:56 -04:00
Lantao Liu
b27a4c1723
Merge pull request #373 from Random-Liu/update-cri-tools
Update cri-tools version to 8e989f8b7a716534896ee082b7b1fb47bd66df21.
2017-10-30 16:57:27 +01:00
Lantao Liu
dcb22bebae
Merge pull request #372 from Random-Liu/add-container-log-path
Add the missing container log path in container status.
2017-10-30 16:57:10 +01:00
Phil Estes
5fb3a0e0cf
Merge pull request #1695 from runcom/abstract-release-tool
cmd: containerd-release: abstract it out to create a new project
2017-10-30 10:23:52 -04:00
Antonio Murdaca
fa678a0937
cmd: containerd-release: abstract it out to create a new project
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-10-30 15:10:41 +01:00
Michael Crosby
b93bd0cfec
Merge pull request #1676 from AkihiroSuda/null-io-fix
ctr: error if tty && nullIO
2017-10-30 10:10:22 -04:00
Lantao Liu
5d46a90b7f Update cri-tools version to 8e989f8b7a716534896ee082b7b1fb47bd66df21.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-30 06:39:19 +00:00
Lantao Liu
4e6e1cab0d Add the missing container log path in container status.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-30 06:03:52 +00:00
Akihiro Suda
e0da28acc4 ctr: error if tty && nullIO
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-10-29 23:58:57 +09:00
Lantao Liu
1d14c11dcb
Merge pull request #368 from Random-Liu/not-log-output
Do not log container output in error log.
2017-10-28 05:50:14 +02:00
Lantao Liu
f2fa351a1f Do not log container output in error log.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-28 02:16:43 +00:00
Lantao Liu
c3b03f8fec
Merge pull request #366 from Random-Liu/add-dump-stack
Add stack dump.
2017-10-28 02:15:17 +02:00
Lantao Liu
439ee0a973 Add stack dump.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 22:45:38 +00:00
Lantao Liu
6cded68bac
Merge pull request #360 from Random-Liu/add-image-load
Add image load
2017-10-28 00:43:20 +02:00
Lantao Liu
7f11eff42d Add integration test for image load
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 21:51:04 +00:00
Lantao Liu
25fdf72692 Add image load.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 21:51:04 +00:00
Michael Crosby
e74c423f78 Fix races with concurrent GC
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-27 14:47:23 -04:00
Lantao Liu
64c719622a
Merge pull request #365 from Random-Liu/random-fix
Fix a log line and also set containerd log level to debug in node e2e.
2017-10-27 19:44:15 +02:00
Lantao Liu
32806fa375 Fix a log line and also set containerd log level to debug in node e2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 07:21:37 +00:00
Lantao Liu
c6fd18ddc3 Update cobra and pflag
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 06:42:18 +00:00
Lantao Liu
1d5cd86207 Merge pull request #364 from Random-Liu/revert-#338
Revert "Put containerd-shim into pod cgroup"
2017-10-27 08:13:44 +02:00
Lantao Liu
f10cc58362 Revert "Put containerd-shim into pod cgroup"
This reverts commit e9cf1d5909.

Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 05:33:55 +00:00
Lantao Liu
486d7628c0 Merge pull request #363 from Random-Liu/fix-node-e2e
Add `--ipv4` in `curl`.
2017-10-27 06:19:06 +02:00
Lantao Liu
22adf92f66 Add --ipv4 in curl.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 02:57:34 +00:00
Lantao Liu
4b40fe74b9 Merge pull request #362 from Random-Liu/add-log
Add log of generated id for debugging.
2017-10-27 04:47:25 +02:00
Lantao Liu
5e74cba0f0 Add log of generated id for debugging.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 00:11:16 +00:00
Phil Estes
1f704e9862 Merge pull request #1688 from crosbymichael/cli
Update cli to 7bc6a0acffa589f415f88aca16cc1de5ffd6
2017-10-26 23:11:31 +02:00
Michael Crosby
994c717d0d Merge pull request #1689 from jessvalarezo/ctr-refactor-third-pass
ctr: move signals, resolver utility functions to commands package
2017-10-26 16:46:15 -04:00
Lantao Liu
6c6b337e87 Merge pull request #358 from Random-Liu/unpack-when-creation
Also unpack image during creation.
2017-10-26 22:44:07 +02:00
Jess Valarezo
16855eedf7 ctr: move resolver to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-26 16:31:58 -04:00
Jess Valarezo
ffd0d2ef58 ctr: move signals to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-26 16:31:23 -04:00
Michael Crosby
b8c4d85564 Add buildmode=pie to makefile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-26 16:25:30 -04:00
Michael Crosby
9d05197f96 Update cli to 7bc6a0acffa589f415f88aca16cc1de5ffd6
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-26 15:17:22 -04:00
Derek McGowan
638f3a3380 Merge pull request #1685 from jessvalarezo/ctr-refactor
ctr: move ctr commands
2017-10-26 11:36:18 -07:00
Lantao Liu
acc3f74d5c Also unpack image during creation.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-26 17:57:53 +00:00
Lantao Liu
4d713ece79 Merge pull request #338 from miaoyq/debug-add-shim-to-cgroup
Put containerd-shim into pod cgroup
2017-10-26 05:06:09 +02:00
Jess Valarezo
8540587b37 ctr: move events command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 22:21:57 -04:00
Yanqiang Miao
e9cf1d5909 Put containerd-shim into pod cgroup
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-10-26 10:17:12 +08:00
Jess Valarezo
fdb6859921 ctr: move namespaces command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 22:00:14 -04:00
Jess Valarezo
750fd89b38 ctr: move snapshot command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 21:23:41 -04:00
Jess Valarezo
0895dbe932 ctr: move content command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 21:16:44 -04:00
Jess Valarezo
f980cc197e ctr: move images command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 21:08:00 -04:00
Jess Valarezo
47fae4dd17 ctr: move containers command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 21:07:54 -04:00