Michael Crosby
026bf2902a
Merge pull request #1861 from jessvalarezo/images-err-2
...
update images error (pt. 2)
2017-12-01 18:53:43 -05:00
Michael Crosby
96572395ad
Merge pull request #1860 from stevvooe/ignore-not-found
...
integration: ignore not found error on cleanup
2017-12-01 18:33:58 -05:00
Jess Valarezo
41ac9fac8e
update images error
...
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-12-01 15:14:55 -08:00
Stephen J Day
0925a88639
integration: ignore not found error on cleanup
...
This ignore "not found" errors that may arise during test cleanup. Since
the goal is to make the content "not found", it is okay to skip them and
not fail the test.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-12-01 15:06:38 -08:00
Stephen Day
271836a417
Merge pull request #1858 from jessvalarezo/images-errors
...
update image error messages
2017-12-01 14:58:12 -08:00
Michael Crosby
e28943279f
Merge pull request #1857 from stevvooe/less-noise
...
cmd/ctr: move log messages to debug
2017-12-01 17:58:04 -05:00
Derek McGowan
b28d7cdf1b
Update snapshot and content related log messages
...
Make the tense and casing consistent.
Add useful log messages in image service.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-12-01 14:57:34 -08:00
Mike Brown
009e40f280
correct some boilerplates
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-01 16:56:25 -06:00
Mike Brown
4c7974fe97
fixes for boilerplate
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-01 16:55:30 -06:00
Derek McGowan
8c550859d1
Merge pull request #1855 from stevvooe/update-ttrpc
...
vendor: update ttrpc to pull in euid change
2017-12-01 14:53:48 -08:00
Michael Crosby
fd2e3cd326
Remove mount namespace from shim
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-01 17:35:14 -05:00
Stephen J Day
1710fe9b95
cmd/ctr: move log messages to debug
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-12-01 13:57:54 -08:00
Jess Valarezo
2b1595124f
update image error messages
...
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-12-01 13:54:26 -08:00
Derek McGowan
f6df9f6632
Merge pull request #1854 from yanxuean/overlay-prepare-rollback
...
snapshots/overlay: cleanup rollback code for overlay.prepare
2017-12-01 13:32:40 -08:00
Lantao Liu
cad87243e1
Merge pull request #454 from Random-Liu/revert-453
...
Revert "Add gc.root back in vendored containerd client."
2017-12-01 12:19:23 -08:00
Lantao Liu
3a0d40cc2c
Merge pull request #456 from Random-Liu/fix-shim-cgroup-change
...
Move shim cgroup opts to pkg/containerd/opts.
2017-12-01 12:18:34 -08:00
Stephen J Day
4b36430425
vendor: update ttrpc to pull in euid change
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-12-01 12:08:15 -08:00
Akihiro Suda
222156d598
Merge pull request #1847 from jessvalarezo/metadata-errors
...
metadata: update container error messages
2017-12-02 04:42:40 +09:00
Lantao Liu
181d7d5076
Move shim cgroup opts to pkg/containerd/opts.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 19:18:26 +00:00
Lantao Liu
eb6cca3c49
Revert "Add gc.root back in vendored containerd client."
...
This reverts commit 66ecfa70ad
.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 18:43:32 +00:00
Jess Valarezo
b873ae8b55
metadata: update container error messages
...
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-12-01 10:32:48 -08:00
Lantao Liu
4a5431e10a
Merge pull request #451 from abhi/cgroup-shim
...
Setting containerd shim cgroup same as pod cgroup
2017-12-01 10:21:16 -08:00
abhi
0d6774f4af
Setting containerd shim cgroup same as pod cgroup
...
Signed-off-by: abhi <abhi@docker.com>
2017-12-01 08:33:50 -08:00
yason
bb02302c9c
improve rollback for overlay.prepare
...
improve err message
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-02 00:09:44 +08:00
Michael Crosby
38fdf9c8c9
Merge pull request #1846 from crosbymichael/service
...
Add rlimits to service file
2017-12-01 10:21:39 -05:00
Phil Estes
16a2177ae3
Merge pull request #1852 from yanxuean/error-log
...
improve error message
2017-12-01 10:07:54 -05:00
yason
4f1c0e067e
improve error message
...
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-01 15:45:15 +08:00
Lantao Liu
b622aaa85d
Merge pull request #453 from Random-Liu/add-gc-root
...
Add gc.root back in vendored containerd client.
2017-11-30 21:23:04 -08:00
Akihiro Suda
c9c36d4afa
Merge pull request #1849 from stevvooe/unix-socket-credentials
...
cmd/containerd-shim: require unix socket credentials
2017-12-01 14:08:42 +09:00
Lantao Liu
66ecfa70ad
Add gc.root back in vendored containerd client.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 04:37:40 +00:00
Stephen J Day
2d966df174
cmd/containerd-shim: require unix socket credentials
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-30 20:34:29 -08:00
yanxuean
fa8593ffa0
Add intergration test for truncindex
...
fix #343
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-01 10:06:21 +08:00
Phil Estes
efe9e284fd
Merge pull request #1850 from mlaventure/min-kern-version
...
Fix flexible kernel version
2017-11-30 20:42:34 -05:00
Kenfe-Mickael Laventure
9d759203b0
Fix flexible kernel version
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-11-30 17:31:00 -08:00
Lantao Liu
0a954e7a0d
Merge pull request #450 from Random-Liu/update-containerd
...
Update containerd to fix fd leakage.
2017-11-30 17:04:46 -08:00
Lantao Liu
76ba19d6c8
Merge pull request #449 from Random-Liu/add-ulimit-in-systemd-units
...
Add LimitNPROC, LimitNOFILE and LimitCORE for containerd and cri-containerd.
2017-11-30 17:04:01 -08:00
Derek McGowan
08f179386e
Merge pull request #1848 from dmcgowan/update-version-rc.0
...
Prepare release v1.0.0-rc.0
2017-11-30 16:35:22 -08:00
Lantao Liu
b47770eaee
Update containerd to fix fd leakage.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 00:24:44 +00:00
Lantao Liu
5a17149a70
Add LimitNPROC, LimitNOFILE and LimitCORE for containerd and
...
cri-containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 00:16:58 +00:00
Derek McGowan
30ac46e9cf
Update version to v1.0.0-rc.0
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-30 16:16:13 -08:00
Derek McGowan
4bcd272c14
Merge pull request #1845 from dmcgowan/fix-rc.0-notes
...
Update previous version to beta not current rc
2017-11-30 16:02:59 -08:00
Michael Crosby
b009642e1a
Add rlimits to service file
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-30 18:50:32 -05:00
Derek McGowan
6952a61daa
Update previous version to beta not current rc
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-30 15:48:43 -08:00
Derek McGowan
7e4be4639a
Merge pull request #1834 from dmcgowan/v1.0.0-rc.0-notes
...
Add release notes for v1.0.0-rc.0
2017-11-30 15:44:43 -08:00
Derek McGowan
07d4154515
Merge pull request #1844 from Random-Liu/close-fifos-on-failure
...
Close FIFOs on failure.
2017-11-30 15:40:40 -08:00
Lantao Liu
a03fdabc14
Close FIFOs on failure.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-30 23:19:12 +00:00
Derek McGowan
e64d179163
Add release notes for v1.0.0-rc.0
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-30 14:58:44 -08:00
Derek McGowan
763d29f4c2
Merge pull request #1842 from dmcgowan/fix-snapshot-close-twice
...
Fix close twice test to retain snapshots
2017-11-30 14:57:48 -08:00
Derek McGowan
25b5592eaf
Fix close twice test to retain snapshot
...
Update to set labels and use a unique key
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-30 14:43:33 -08:00
Michael Crosby
2657e49fc1
Merge pull request #1835 from stevvooe/we-use-ttrpc
...
shim: we use ttrpc in the shim now
2017-11-30 16:35:42 -05:00