Michael Crosby
4a6e2975cf
Merge pull request #1994 from AkihiroSuda/fix-user
...
fix running a container with config.User
2018-01-12 12:57:31 -05:00
Akihiro Suda
1645d8406d
oci: simplify WithImageConfig
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-12 15:46:53 +09:00
Akihiro Suda
b99dc56817
oci: add TODO comments
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-12 15:36:18 +09:00
Akihiro Suda
369d7c9545
oci: fix err variable scope
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-12 15:36:18 +09:00
Akihiro Suda
1167035be3
ctr: promote cOpts over opts, as oci.WithImageConfig requires snapshot
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-11 14:04:11 +09:00
Michael Crosby
90553efdef
Merge pull request #1989 from crosbymichael/reaper
...
Remove reaper from containerd daemon
2018-01-10 18:10:15 -05:00
Michael Crosby
bf0236b457
Merge pull request #1991 from dnephin/fix-progress-panic
...
Prevent panic from progress writer when console width is not available
2018-01-10 18:09:02 -05:00
Phil Estes
0b449a4a51
Merge pull request #1982 from stevvooe/deletion-race-handling
...
services/tasks, linux: ignore shutdown tasks
2018-01-10 16:53:42 -05:00
Stephen J Day
c80ca4f4a2
services/tasks, linux: ignore shutdown tasks
...
Because tasks may be deleted while listing containers, we need to ignore
errors from state requests that are due to a closed error. All of these
get mapped to ErrNotFound, which can be used to filter the entries.
There may be a better fix that does a better job of keeping track of the
intended state of a backend task. The current condition of assuming that
a closed client is a shutdown task may be too naive.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-10 11:45:33 -08:00
Daniel Nephin
8db626e6ea
Dont clear lines if the console width is unavailable
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-10 14:41:16 -05:00
Daniel Nephin
c4b1684528
Use a default width of 80
...
to prevent a panic when console.Size() returns 0 width.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-10 14:36:55 -05:00
Michael Crosby
9f5182f394
Remove reaper from containerd daemon
...
This allows other packages and plugins to easily exec things without
racing with the reaper.
The reaper is mostly needed in the shim but can be removed in containerd
in favor of the `exec.Cmd` apis
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-10 11:51:58 -05:00
Michael Crosby
c602b85f80
Merge pull request #1987 from schomatis/revert-1937-add-native-build-i-option
...
Remove go build option '-i' for native builds
2018-01-10 11:27:47 -05:00
Lucas Molas
5fd9904684
Revert "Add go build option '-i' only for native builds"
...
Signed-off-by: Lucas Molas <lmolas@fundacionsadosky.org.ar>
2018-01-10 12:54:42 -03:00
Michael Crosby
45fbc3b3c2
Merge pull request #1975 from dnephin/add-unconvert-linter
...
Add unconvert linter
2018-01-10 10:54:00 -05:00
Michael Crosby
787e1a2b69
Merge pull request #1970 from dmcgowan/lease-add-on-writer
...
metadata: add content lease on existing content
2018-01-10 10:49:00 -05:00
Kenfe-Mickaël Laventure
723196b268
Merge pull request #1981 from stevvooe/update-ttrpc-closed
...
vendor: update ttrpc for shutdown fix
2018-01-09 17:20:31 -08:00
Stephen J Day
87cb12de32
vendor: update ttrpc for shutdown fix
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-09 16:13:43 -08:00
Phil Estes
29ddd3d5fb
Merge pull request #1931 from dmcgowan/tar-diff-include-parent-dirs
...
archive: track and include parent directories
2018-01-09 17:38:02 -05:00
Daniel Nephin
184bc25629
Add unconvert linter
...
This linter checks for unnecessary type convertions.
Some convertions are whitelisted because their type is different
on 32bit platforms
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-09 17:36:44 -05:00
Derek McGowan
0d8b093361
metadata: add content lease on existing content
...
When a writer is requested for an object that already
exists, add that object to the provided any lease to prevent
other operations from affecting the current lease's use of
that content.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-09 14:33:30 -08:00
Michael Crosby
50a6c62492
Merge pull request #1977 from dnephin/add-vendor-validation
...
Add a vendor check to CI
2018-01-09 11:38:04 -05:00
Daniel Nephin
315084fa15
Add a vendor check to CI
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-09 11:06:35 -05:00
Michael Crosby
b5204b77cd
Merge pull request #1978 from mlaventure/ctr-no-pivot-root
...
Add no-pivot flag to ctr
2018-01-09 10:59:42 -05:00
Kenfe-Mickaël Laventure
2fb85c6f01
Merge pull request #1979 from crosbymichael/badge
...
Add CII badge for containerd
2018-01-09 07:52:53 -08:00
Kenfe-Mickael Laventure
0cc79a6ff6
Add no-pivot flag to ctr
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2018-01-09 07:48:30 -08:00
Michael Crosby
f6f0e258f6
Add CCI badge for containerd
...
Closes #1539
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-09 10:14:09 -05:00
Michael Crosby
b509e78578
Merge pull request #1976 from dnephin/move-dco-validation-out-of-makefile
...
Remove DCO check from makefile
2018-01-09 09:27:44 -05:00
Daniel Nephin
ebbcececa1
Remove DCO check from makefile, move to .travis.yml
...
The DCO check is primarily only relevant as part of CI, so it
doesn't need to be in the Makefile. A contributor looking to
validate their commits can run script/validate/dco.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-08 18:35:15 -05:00
Michael Crosby
1df6287150
Merge pull request #1968 from dmcgowan/mount-temp-dir-error-cleanup
...
mount: clean up error logs and messages in temp mount
2018-01-08 10:39:57 -05:00
Phil Estes
aa68494541
Merge pull request #1972 from weekface/master
...
Fix some wrong links
2018-01-08 10:09:00 -05:00
weekface
284860d9e3
Fix some wrong links
...
Signed-off-by: weekface <weekface@gmail.com>
2018-01-08 10:40:09 +08:00
Derek McGowan
dfd7ee122f
Clean up error logs and messages in temp mount
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-05 15:37:11 -08:00
Stephen Day
632f78a530
Merge pull request #1967 from crosbymichael/grpc-timing
...
Enable grpc timing histograms
2018-01-05 15:26:49 -08:00
Michael Crosby
fd29dbe4c8
Enable grpc timing histograms
...
This enables the grpc timing histograms via a config option as they are
metrics of high cardinality.
This is useful for perf testing and debugging but should not be the
default on production systems unless needed.
```toml
[metrics]
grpc_histogram = true
```
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-05 15:03:15 -05:00
Derek McGowan
002c0e2901
Merge pull request #1887 from yanxuean/unmount-remove
...
solve some bug for unmount and improve
2018-01-05 11:05:01 -08:00
Phil Estes
e892671e39
Merge pull request #1965 from crosbymichael/hold-state-lock
...
Hold shim lock during state
2018-01-05 12:16:40 -05:00
yanxuean
cb58bb885a
solve incorrect unmount
...
1. add WithTempMount for better unmount and remove
2. solve incorrect unmount for
diff.DiffMounts,
diff.Apply,
oci.WithUsername,
oci.WithUserID,
remapRootFS
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2018-01-06 00:28:16 +08:00
Michael Crosby
2b29a92a64
Hold shim lock during state
...
Helps with #1935
This hold the shim lock during the state call to make sure that the task
does not get deleted during a state call.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-05 11:13:47 -05:00
Phil Estes
8b6909f22f
Merge pull request #1964 from stevvooe/remove-silly-makefile-stuff
...
Makefile: no need to calculate GOOS
2018-01-05 10:41:38 -05:00
Phil Estes
7688af6f5b
Merge pull request #1963 from crosbymichael/cri-maintainers
...
Add cri-containerd maintainers and reviewers
2018-01-05 10:38:22 -05:00
Stephen J Day
1c8911b1f1
Makefile: no need to calculate GOOS
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-04 17:30:01 -08:00
Phil Estes
ab7150f0ff
Merge pull request #1959 from containerd/netlify-config
...
Add build config for jekyll + netlify
2018-01-04 12:02:22 -05:00
Chris Aniszczyk
b12e5794b1
Force ruby version for docs build
...
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2018-01-04 10:49:50 -06:00
Phil Estes
c09086464e
Merge pull request #1958 from crosbymichael/roadmap
...
Update roadmap.md with issue labels and milestones
2018-01-04 10:55:59 -05:00
Michael Crosby
88685b0475
Update roadmap.md with issue labels and milestones
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-04 10:47:06 -05:00
Michael Crosby
121a0861cb
Add cri-containerd reviewers
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-04 10:06:13 -05:00
Michael Crosby
18ed54e548
Add cri-containerd maintainers
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-04 10:01:03 -05:00
Daniel, Dao Quang Minh
5b931ca703
Merge pull request #1941 from crosbymichael/reviewers
...
Add concept of reviews and 2 new reviewers
2018-01-04 11:53:56 +00:00
Chris Aniszczyk
fea2c381b1
Add build config for jekyll + netlify
...
https://www.netlify.com/blog/2017/05/11/migrating-your-jekyll-site-to-netlify/
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2018-01-03 16:22:22 -06:00