Commit Graph

8778 Commits

Author SHA1 Message Date
Stephen Day
c933088381
Merge pull request #1663 from dmcgowan/content-local-labels
content: add support for label storage in local content store
2017-11-01 11:24:15 -07:00
Lantao Liu
2453c03daa Do not call Usage inside Walk.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-01 18:11:11 +00:00
Stephen Day
a7a869f14e
Merge pull request #1703 from estesp/remove-copyright
Update LICENSE.docs with proper CC-BY-4.0 text
2017-11-01 10:49:13 -07:00
Phil Estes
aa3516487c
Merge pull request #1704 from jessvalarezo/ctr-move-tasks
ctr: move commands (tasks, run, pprof, shim)
2017-11-01 12:57:07 -04:00
Aaron Crickenberger
04373a934d Rename OWNERS assignees: to approvers:
They are effectively the same, assignees is deprecated

Signed-off-by: Aaron Crickenberger <spiffxp@gmail.com>
2017-11-01 08:49:17 -07:00
Lantao Liu
2cb1572667
Merge pull request #379 from yanxuean/unpack
Use image.IsUnpacked
2017-11-01 07:50:12 +01:00
Lantao Liu
e5eac0af83
Merge pull request #376 from Random-Liu/update-cri-containerd-version-in-ansible
Update cri-containerd version to 1.0.0-alpha.1 in ansible.
2017-11-01 06:56:38 +01:00
yanxuean
9027a02e8e Use image.IsUnpacked
fix #361
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-01 13:51:25 +08:00
Lantao Liu
964aebfb51
Merge pull request #378 from Random-Liu/rename-tarball
Rename release tarball for node e2e to cri-containerd-cni.
2017-11-01 03:58:42 +01:00
Lantao Liu
1d228cbc38 Rename release tarball for node e2e to cri-containerd-cni.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-01 01:31:21 +00:00
Lantao Liu
10ada61fe6 Update cri-containerd version to 1.0.0-alpha.1 in ansible.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-01 00:06:22 +00:00
Lantao Liu
c44f798145
Merge pull request #371 from Random-Liu/fix-removing
Fix removing state recover.
2017-10-31 22:29:53 +01:00
Lantao Liu
4eaaee380f Fix removing state recover.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-31 20:03:58 +00:00
Derek McGowan
7b08bcdb65
Add support for label storage in local content store
Allows running tests which require labels on the content store

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-31 12:59:52 -07:00
Lantao Liu
95067d76a7
Merge pull request #374 from Random-Liu/add-runtime-cgroup
Add runtime cgroup and put containerd and cri-containerd into it.
2017-10-31 20:59:13 +01:00
Jess Valarezo
864b16a2cb ctr: alphabetize commands, rename signals
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:49 -07:00
Jess Valarezo
f654b7b71e ctr: move pprof to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:49 -07:00
Jess Valarezo
a827a17f1d ctr: move shim to commands
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:49 -07:00
Jess Valarezo
c3b70f1d0b ctr: move tasks, run to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:41 -07:00
Phil Estes
7d6017a954
Update LICENSE.docs with proper CC-BY-4.0 text
Follow-on to #1702 to correct the actual license text of the CC-BY-4.0
license. Also clean up Licenses section of README.md and link to
LICENSE.code file. Remove unecessary copyright and "rights reserved"
statement.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-10-31 11:46:59 -04:00
Kenfe-Mickaël Laventure
fe3d9a70fa
Merge pull request #1702 from estesp/fix-cc-by-lic
Fix CC-BY license reference in README.md
2017-11-01 01:47:11 +11:00
Phil Estes
474d4df2aa
Merge pull request #1692 from dmcgowan/gc-fix-sweep-race
Fix race in gc sweep
2017-10-31 10:28:33 -04:00
Phil Estes
ff904841f9
Merge pull request #1668 from jessvalarezo/image-unpack-check
client: Add helper function which checks if an image is unpacked
2017-10-31 10:23:08 -04:00
Phil Estes
015788f1d8
Fix CC-BY license reference in README.md
Fix the reference to the shortname of the correct license already being
linked to in the README.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-10-31 10:19:16 -04:00
Lantao Liu
95dfd3c039 Add runtime cgroup and put containerd and cri-containerd into it.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-31 06:21:20 +00:00
Akihiro Suda
7fd20edf4e
Merge pull request #1701 from stevvooe/backoff-v1-images
remotes/docker/schema1: back off on locked ref
2017-10-31 15:04:46 +09:00
Phil Estes
9f5b97c510
Merge pull request #1698 from crosbymichael/task-ls
Move task list to separate command
2017-10-30 21:30:02 -04:00
Phil Estes
8bbf8d892a
Merge pull request #1693 from jessvalarezo/ctr-refactor-fourth-pass
ctr: move more commands
2017-10-30 21:29:24 -04:00
Jess Valarezo
1552ee23da client: Add helper function which checks if an image is unpacked
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 16:33:54 -07:00
Stephen J Day
8eee47cf82
remotes/docker/schema1: back off on locked ref
To allow concurrent pull of images of the v1 persuasion, we need to
backoff when multiple pullers are trying to operate on the same
resource. The back off logic is ported to v1 pull to match the behavior
for other images.

A little randomness is also added to the backoff to prevent thundering
herd and to reduce expected recovery time.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-10-30 15:40:54 -07:00
Jess Valarezo
7a1d709cc9 ctr: remove apply command
* in its current state, apply command should not be in ctr

Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 14:46:44 -07:00
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