Commit Graph

8706 Commits

Author SHA1 Message Date
Michael Crosby
e5912e1c89
Merge pull request #1734 from vieux/update_images_ls_platforms
Add S to PLATFORM in images list & plugins list
2017-11-08 13:53:16 -05:00
Jess Valarezo
8866254ec3
update notes with ctr changes
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-11-08 10:51:13 -08:00
Stephen J Day
3289ca2fca
release: prepare 1.0.0-beta.3
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-08 10:51:13 -08:00
Victor Vieux
f8a536ed6a Add S to PLATFORM in images & plugins list
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-11-08 10:43:12 -08:00
Phil Estes
4701e122fe
Merge pull request #1730 from dmcgowan/fix-usage-deadlock
Fix deadlock in overlay snapshotter
2017-11-08 13:34:42 -05:00
Derek McGowan
ad9eca1dc4
Fix deadlock in overlay snapshotter
The Usage implementation in the overlay driver allowed returning
before Rollback was called, leaving a transaction open and causing
further operations to deadlock. This could occur if the usage call
to the datastore returned an error, such as not found.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-08 10:09:03 -08:00
Phil Estes
59d1c16666
Merge pull request #1732 from dmcgowan/fix-userns-tests
Fix not found caused by race to remove snapshot
2017-11-08 11:06:59 -05:00
Derek McGowan
b3659d296d
Fix not found caused by race to remove snapshot
Remapped snapshots are not currently referenced by
any root allowing clean up of the snapshot. Check
for not found on prepare to account for cleanup
after stat.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-08 07:48:02 -08:00
Lantao Liu
2433ae7539
Merge pull request #393 from abhi/labels
Adding kube pod and container labels to containerd
2017-11-07 23:39:20 -08:00
abhi
cd5886d647 Adding kube pod and container labels to containerd
Currently we have the pod and container labels part of
containerd metadata extensions. However for third party users
like cadvisor that depend on standard kube labels will need
to be aware of the way metadata is stored in containerd to
fetch the labels.

Signed-off-by: abhi <abhi@docker.com>
2017-11-07 22:19:19 -08:00
Stephen Day
27d450a01b
Merge pull request #1690 from dmcgowan/metadata-transactions
gc: resource leases
2017-11-07 16:11:11 -08:00
Lantao Liu
472f74e952
Merge pull request #403 from Random-Liu/cleanup-config
Cleanup config.
2017-11-07 14:07:20 -08:00
Phil Estes
844e957834
Merge pull request #1729 from crosbymichael/shim-size
Reduce shim size by reducing imports
2017-11-07 16:47:53 -05:00
Lantao Liu
5bbf83bc5d Cleanup config.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-07 21:02:58 +00:00
Derek McGowan
07885f1364
Updates lease creation to respect existing leases
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-07 12:54:22 -08:00
Derek McGowan
dce27d8c62
Remove client use of gc root label
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-07 12:54:22 -08:00
Derek McGowan
e13894bb7a
Add leases api
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-07 12:54:22 -08:00
Michael Crosby
d01fb047f4 Fix runtime root with no-shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 12:12:53 -05:00
Michael Crosby
fc08f019f3 Fix windows compile for dialer package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:56:02 -05:00
Michael Crosby
bba473aeb1 Move shim client into subpackage
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
13c7c3ef10 Remove urfave cli dep from shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
a70b95b202 Move events exchange into subpackage
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
526d15bd86 Move dial funcs to dialer pkg
This reduces shim size from 30mb to 18mb

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
01cdf330bb
Merge pull request #1716 from crosbymichael/strip
Strip binaries in Makefile
2017-11-07 10:44:47 -05:00
Michael Crosby
2aad5ecdf6
Merge pull request #1725 from dmcgowan/diff-parent-permission
fs: add directory permission tests
2017-11-07 09:34:13 -05:00
Lantao Liu
affc6e93a8
Merge pull request #397 from yanxuean/trunc-for-list
Add truncindex for filter in List and Stat
2017-11-07 00:41:03 -08:00
yanxuean
12bbbc0edc add unit test for listcontainer and listpodsandbox
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-07 15:57:29 +08:00
Lantao Liu
6ee3db4825
Merge pull request #402 from Random-Liu/fix-attach-tty
Reverse the wrong logic for tty.
2017-11-06 21:16:38 -08:00
Lantao Liu
75e97dd168 Reverse the wrong logic for tty.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-07 02:03:44 +00:00
Lantao Liu
b9d4eda403
Merge pull request #401 from Random-Liu/add-comment
Add comment for #398.
2017-11-06 14:09:50 -08:00
Lantao Liu
68e74dc16a
Merge pull request #394 from Random-Liu/fix-container-streaming
Various fixes for container streaming.
2017-11-06 14:09:30 -08:00
Derek McGowan
8889d459af
Add directory permission tests
Adds tests for verifying parent directory permissions.
Currently an issue exists in extracting into some Docker graph
drivers. Supporting these graph drivers may require changes to
the diff logic, these tests clarify the existing behavior and
that extraction within containerd works.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-06 13:50:04 -08:00
Lantao Liu
6f97764171 Add comment for #398.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 20:54:50 +00:00
Lantao Liu
eec818e6ab Various fixes for container streaming.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 20:50:50 +00:00
Lantao Liu
e363c218d6
Merge pull request #395 from Random-Liu/fix-image-in-container-status
Return image tag as image spec.
2017-11-06 10:55:37 -08:00
Lantao Liu
b6a1697c75
Merge pull request #396 from weiwei04/ansible
replace deprecated ansible include cmd
2017-11-06 10:37:56 -08:00
Lantao Liu
7c4c80befb
Merge pull request #398 from justincormack/remove-comment-read-only
Remove comment about whether other paths should be read only with root
2017-11-06 10:31:49 -08:00
Daniel, Dao Quang Minh
7e398dd591
Merge pull request #1717 from dnephin/use-gometalinter
Use gometalinter for linting
2017-11-06 16:11:46 +00:00
Michael Crosby
46ac2befcc
Merge pull request #1721 from bandoshintaro/master
Fix docs, log output in getting started
2017-11-06 10:35:48 -05:00
Phil Estes
8498de00bd
Merge pull request #1719 from AkihiroSuda/proc-scsi
Add /proc/scsi to masked paths
2017-11-06 09:44:16 -05:00
Justin Cormack
913836474b Remove comment about whether other paths should be read only with ro root
Since https://github.com/moby/moby/pull/35344 we clarified that this behaviour
was a mistake, and the read only flag should just apply to the actual rootfs,
so it corresponds to the OCI read-only option. Other mounts may be able to be
adjusted by re-specifying them or other means but this is unrelated.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-11-06 14:21:16 +00:00
yanxuean
6234337459 Add truncindex for filter in List and Stat
fix #344
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-06 16:47:43 +08:00
Wei Wei
53a4f93967 replace deprecated ansible include cmd
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-11-06 15:06:46 +08:00
Lantao Liu
4a4a860dfa
Merge pull request #392 from Random-Liu/add-crictl-config
Add crictl config.
2017-11-05 22:14:21 -08:00
Lantao Liu
050ee1de95 Return image tag as image spec.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 06:05:49 +00:00
Lantao Liu
74abfe349d Add crictl config.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 05:28:58 +00:00
bando-shintaro
5128f034b8 Fix docs, log output in getting started
Signed-off-by: bando-shintaro <bando142141@gmail.com>
2017-11-05 23:25:27 +09:00
Akihiro Suda
db589884ee Add /proc/scsi to masked paths
Port over https://github.com/moby/moby/pull/35399

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-11-04 17:34:28 +00:00
Daniel Nephin
f9e969bac8 Use gometalinter for linting
gometalinter runs linters in parallel for faster linting
it provides a uniform way of whitelisting lines using // nolint or the exclude
field in the config

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-03 18:02:27 -04:00
Lantao Liu
8a1a2f2713
Merge pull request #390 from miaoyq/update-hack-version
Update 'hack/versions'
2017-11-03 10:22:10 -07:00