Stephen J Day
5cab90d270
log: remove log "module" system
...
After comtemplation, the complexity of the logging module system
outweighs its usefulness. This changeset removes the system and restores
lighter weight code paths. As a concession, we can always provide more
context when necessary to log messages to understand them without having
to fork the context for a certain set of calls.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-18 11:22:13 -08:00
Michael Crosby
e1321c51a6
Merge pull request #2022 from denverdino/master
...
Fix NPE in dialer
2018-01-18 13:18:34 -05:00
Li Yi
adfa9a2402
Fix NPE in dialer
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2018-01-18 18:41:24 +08:00
Akihiro Suda
507a149488
cio: add WithFIFODir opt
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-18 14:33:56 +09:00
Stephen Day
acc6011ac1
Merge pull request #1960 from dmcgowan/images-removal-dirty
...
metadata: image removal triggers GC
2018-01-17 13:58:39 -08:00
Phil Estes
80fc1f2d07
Merge pull request #2011 from darrenstahlmsft/ResolveErrors
...
Provide better error context on resolve failures
2018-01-17 16:42:40 -05:00
Darren Stahl
1338a4f022
Provide better error context on resolve failures
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-17 13:22:54 -08:00
Stephen Day
8c4219dd77
Merge pull request #2014 from crosbymichael/issue-template
...
Add github issue template
2018-01-17 11:52:30 -08:00
Michael Crosby
bd8ab7944d
Add github issue template
...
Closes #1950
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-17 11:11:53 -05:00
Phil Estes
aaf930eaf9
Merge pull request #2009 from crosbymichael/user-path
...
Support getting uid/gid from rootfs path
2018-01-17 10:48:59 -05:00
Akihiro Suda
901a906663
Merge pull request #2012 from darrenstahlmsft/HostVersion
...
Print host version in appveyor setup steps
2018-01-17 19:48:27 +09:00
Darren Stahl
baa5c8c13b
Print host version in appveyor setup steps
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-16 17:42:04 -08:00
Michael Crosby
1f5ce14a82
Support getting uid/gid from rootfs path
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-16 14:48:29 -05:00
Michael Crosby
5b042945b0
Refactor get uid/gid from path
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-16 12:01:31 -05:00
Michael Crosby
bbb5b2f15e
Merge pull request #2001 from dmcgowan/fix-whiteout-rootpath
...
archive: check whiteout path before removal
2018-01-12 15:09:11 -05:00
Derek McGowan
384d46d8bd
archive: check whiteout path before removal
...
Ensure whiteout is not pointing to the current directory
or parent directory before removing. Protects against invalid
removal of the parent or current directory.
Add whiteout related tar tests using manufactured tar conditions.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-12 11:43:39 -08:00
Michael Crosby
d3292d9d2a
Merge pull request #2002 from cpuguy83/fs_check_target_stat
...
copyFileInfo: do not err on chown if uid/gid match
2018-01-12 14:31:16 -05:00
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
Brian Goff
e0f8fb47bb
copyFileInfo: do not err on chown if uid/gid match
...
Chown would normally be a no-op if uid/gid match, however some
filesystems (e.g. NFS) will return EPERM.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-01-11 20:54:19 -05: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