Commit Graph

13325 Commits

Author SHA1 Message Date
Lantao Liu
3557cffbbb Fix container exec
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-10 21:03:29 +00:00
Lantao Liu
e41b6d3c24 Refactor container io code
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-10 21:03:29 +00:00
Phil Estes
08760757ed
Fix output on ctr images rm to show actual feedback
Currently the output for a non-existent image reference and a valid
image reference is exactly the same on `ctr images remove`. Instead of
outputting the target ref input, if it is "not found" we should alert
the user in case of a mispelling, but continue not to make it a failure
for the command (given it supports multiple ref entries)

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-11-10 15:21:27 -05:00
Kenfe-Mickaël Laventure
17093c2f6a
Merge pull request #1718 from jessvalarezo/ctr-task-ps
ctr: update task ps command
2017-11-10 11:58:21 -08:00
Jess Valarezo
0961807715 rename runcopts to runctypes
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-11-10 11:43:51 -08:00
Jess Valarezo
807f4d2ec7 expose exec-id on ctr task ps
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-11-10 11:38:51 -08:00
Daniel Nephin
49af59bfca Validate that root and state paths are different.
Using the same path for both results in confusing errors when runtime.newBundle()
attempts to create the directories for the Task

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-10 12:32:51 -05:00
Mike Brown
b4c8efd898
Merge pull request #409 from miaoyq/fix-408
Update golang version to 1.9.x
2017-11-10 09:03:56 -06:00
Yanqiang Miao
a8104ef21b Update golang version to 1.9.x
fixes #408

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-11-10 15:58:24 +08:00
Lantao Liu
ac8b0979fa
Merge pull request #407 from Random-Liu/update-containerd
Update containerd to v1.0.0-beta.3
2017-11-09 16:00:25 -08:00
Michael Crosby
b4a65de5c6
Merge pull request #1740 from stevvooe/update-grpc
vendor: update protobuf, grpc and gogo
2017-11-09 16:57:40 -05:00
Stephen J Day
08d1e72cc0
api,linux,windows: update generated protobufs
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-09 13:37:06 -08:00
Stephen J Day
35697865c0
vendor: update protobuf, grpc and gogo
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-09 13:24:41 -08:00
Lantao Liu
9e6d607aae Update containerd to v1.0.0-beta.3
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-09 21:08:09 +00:00
Phil Estes
b1527e0a10
Handle progress line length properly for formatting
Two issues with a prior PR for handling line-spanning progress bars are
fixed in this PR:
 - corner case where output line len == term width: extra line was being
 added
 - line length calculation was including escape characters causing
 calculations to span lines when output was still only on one line

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-11-09 15:58:51 -05:00
Lantao Liu
b6de04772d
Merge pull request #406 from Random-Liu/fix-attach-stdin
Keep stdin open instead of opening when use it.
2017-11-09 10:31:04 -08:00
Lantao Liu
c4931c8409 Keep stdin open instead of opening when use it.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-09 09:28:30 +00:00
Derek McGowan
2b8ed96d2a
Merge pull request #1705 from stevvooe/beta3
release: prepare 1.0.0-beta.3
2017-11-08 11:22:26 -08:00
Derek McGowan
cb3b9601a4
Add garbage collection release notes
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-08 11:05:29 -08:00
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