Commit Graph

5732 Commits

Author SHA1 Message Date
Phil Estes
4523ab734a
Merge pull request #3766 from estesp/move-autocomplete
Move autocomplete files to contrib/
2019-10-22 08:42:11 -04:00
Akihiro Suda
0d8fc0a487
Merge pull request #3767 from thaJeztah/bump_grpc
bump google.golang.org/grpc v1.23.1
2019-10-22 11:47:18 +09:00
Phil Estes
3bf461ae8e
Move autocomplete files to contrib/
Since recent versions of `vndr` are going to remove the autocomplete
scripts from the urfave vendored content, we will just move them into
`contrib/` and reference them in the documentation from that location.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-10-21 13:57:56 -04:00
Sebastiaan van Stijn
885232b72f
bump google.golang.org/grpc v1.23.1
full diff: https://github.com/grpc/grpc-go/compare/v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-21 17:56:20 +02:00
Phil Estes
3e3c5fe129
Merge pull request #3759 from fuweid/me-update-vendor
vendor: call vndr to remove useless pkgs and update vendor
2019-10-21 15:08:08 +02:00
Maksym Pavlenko
36c4260e6f
Merge pull request #3760 from thaJeztah/bump_golang_1.12.x
Update Golang 1.12.12 (CVE-2019-17596)
2019-10-18 11:11:40 -07:00
Sebastiaan van Stijn
6356e55be0
Update Golang 1.12.12 (CVE-2019-17596)
Golang 1.12.12
-------------------------------

go1.12.12 (released 2019/10/17) includes fixes to the go command, runtime,
syscall and net packages. See the Go 1.12.12 milestone on our issue tracker for
details.

https://github.com/golang/go/issues?q=milestone%3AGo1.12.12

Golang 1.12.11 (CVE-2019-17596)
-------------------------------

go1.12.11 (released 2019/10/17) includes security fixes to the crypto/dsa
package. See the Go 1.12.11 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.12.11

[security] Go 1.13.2 and Go 1.12.11 are released

Hi gophers,

We have just released Go 1.13.2 and Go 1.12.11 to address a recently reported
security issue. We recommend that all affected users update to one of these
releases (if you're not sure which, choose Go 1.13.2).

Invalid DSA public keys can cause a panic in dsa.Verify. In particular, using
crypto/x509.Verify on a crafted X.509 certificate chain can lead to a panic,
even if the certificates don't chain to a trusted root. The chain can be
delivered via a crypto/tls connection to a client, or to a server that accepts
and verifies client certificates. net/http clients can be made to crash by an
HTTPS server, while net/http servers that accept client certificates will
recover the panic and are unaffected.

Moreover, an application might crash invoking
crypto/x509.(*CertificateRequest).CheckSignature on an X.509 certificate
request, parsing a golang.org/x/crypto/openpgp Entity, or during a
golang.org/x/crypto/otr conversation. Finally, a golang.org/x/crypto/ssh client
can panic due to a malformed host key, while a server could panic if either
PublicKeyCallback accepts a malformed public key, or if IsUserAuthority accepts
a certificate with a malformed public key.

The issue is CVE-2019-17596 and Go issue golang.org/issue/34960.

Thanks to Daniel Mandragona for discovering and reporting this issue. We'd also
like to thank regilero for a previous disclosure of CVE-2019-16276.

The Go 1.13.2 release also includes a fix to the compiler that prevents improper
access to negative slice indexes in rare cases. Affected code, in which the
compiler can prove that the index is zero or negative, would have resulted in a
panic in Go 1.12, but could have led to arbitrary memory read and writes in Go
1.13 and Go 1.13.1. This is Go issue golang.org/issue/34802.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-18 13:52:34 +02:00
Wei Fu
074b453ac6 vendor: call vndr to remove useless pkgs and update vendor
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-10-18 17:49:22 +08:00
Michael Crosby
9c86b8f5ed
Merge pull request #3750 from ecordell/202-accepted-response
Allow 202 response code for commit
2019-10-14 11:13:19 -04:00
Evan Cordell
7177af84ac Allow 202 response code for commit
Quay returns this status code when pushing

Signed-off-by: Evan Cordell <cordell.evan@gmail.com>
2019-10-14 09:21:31 -04:00
Wei Fu
acdcf13d5e
Merge pull request #3749 from AkihiroSuda/native-copydir-allow-xattr-errors
snapshots/native: ignore xattr errors during CopyDir
2019-10-14 13:37:12 +08:00
Akihiro Suda
d52cbc19be snapshots/native: ignore xattr errors during CopyDir
`secuity.*` xattrs cannot be copied in most cases

For moby/buildkit#1189

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-13 01:53:35 +09:00
Phil Estes
57cfc90260
Merge pull request #3743 from crosbymichael/v2blocking
Handle large output in v2 shim with TTY
2019-10-11 16:21:07 -04:00
Michael Crosby
f8cca26f3c Handle large output in v2 shim with TTY
Reized the I/O buffers to align with the size of the kernel buffers with fifos
and move the close aspect of the console to key off of the stdin closing.

Fixes #3738

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-11 15:42:05 -04:00
Phil Estes
6af355f3c7
Merge pull request #3744 from crosbymichael/test-flags
Move flag.Parse in tests to TestMain
2019-10-11 14:13:10 -04:00
Michael Crosby
d5b7bf51aa
Move flag.Parse in tests to TestMain
This this fixes issues with custom and testing flags in Go 1.3 and should work
in previous go versions.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-11 13:27:54 -04:00
Michael Crosby
38937f0607
Merge pull request #3718 from crosbymichael/devperms
Add spec opts for host device and privileged handling
2019-10-11 09:56:14 -04:00
Phil Estes
41028772ba
Merge pull request #3741 from crosbymichael/localfs
Add local-fs.target to service file
2019-10-10 17:40:12 -04:00
Michael Crosby
54257bb5e6
Add local-fs.target to service file
This will ensure that containerd is started after the /etc/fstab entries

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-10 17:06:39 -04:00
Michael Crosby
a6d3f4d30b
Add device opts to ctr --privileged
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-10 14:23:59 -04:00
Phil Estes
a6a0c8b6e3
Merge pull request #3736 from Random-Liu/final-fix-delete-code
Fix delete error code on the containerd daemon side.
2019-10-09 11:45:20 -04:00
Lantao Liu
ffcb1cc9be Fix delete error code on the containerd daemon side.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-09 00:28:51 -07:00
Derek McGowan
772aaf127a
Merge pull request #3729 from seemethere/fix_man
build: Fix manpage generation
2019-10-08 16:13:04 -07:00
Eli Uriegas
036db34f37
build: Fix manpage generation
Seems to be that docs/man/ctr.1.md and docs/man/containerd.1.md were
removed in #3637 and were not updated correctly in the Makefile, leading
to build failures like:

    + make man

    make: *** No rule to make target `man/ctr.1', needed by `man'.  Stop.

Changes the gen-manpages command to be specific on which manpages are to
be generated.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-10-08 18:22:23 +00:00
Michael Crosby
c0c6b51179
Merge pull request #3730 from Random-Liu/fix-error-code
Fix shim delete error code.
2019-10-08 10:32:24 -04:00
Lantao Liu
06be794cb2 Fix shim delete error code.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-07 23:21:57 -07:00
Phil Estes
614c0858f2
Merge pull request #3728 from crosbymichael/dist-rm
Add distribution subpkgs to core
2019-10-07 14:18:04 -04:00
Phil Estes
c58e1e20d6
Merge pull request #3725 from fuweid/me-use-runtime-version
version: use runtime.Version() directly
2019-10-07 13:54:28 -04:00
Michael Crosby
901bcb2231 Add distribution subpkgs to core
Ref: #3554

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-07 13:38:12 -04:00
Wei Fu
eaef634ef7 version: use runtime.Version() directly
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-10-07 22:45:26 +08:00
Michael Crosby
25947db049 Add support for spec generation with host devices
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-07 10:37:58 -04:00
Michael Crosby
8d0d1ebb63
Merge pull request #3716 from fahedouch/add_go_version_to_cli
adding go version to client description
2019-10-07 10:29:23 -04:00
Maksym Pavlenko
635dbf251a
Merge pull request #3720 from dmcgowan/fix-flaky-btrfs
Fix flaky btrfs test
2019-10-06 17:10:11 -07:00
Akihiro Suda
ea8cb3ac46
Merge pull request #3721 from thaJeztah/bump_runc_1.0.0-rc9
bump runc v1.0.0-rc9
2019-10-06 23:07:26 +09:00
fahed dorgaa
c0984941e3 adding go version to client description
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

gofmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add a Godoc

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

go fmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add sapces to comment

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
2019-10-06 13:38:51 +02:00
Sebastiaan van Stijn
fe947e83dc
bump runc v1.0.0-rc9
No code changes since the last vendor bump

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 00:02:29 +02:00
Derek McGowan
772032598a
Fix flaky btrfs test
Add logging and move the creation of the snapshotter inside
the attempt loop to catch cases where the mountinfo may
not be updated yet. When all attempts are reached there
is no reason to create the snapshotter as the unmount has
already occurred.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-04 17:51:45 -07:00
Michael Crosby
2a6d13b2ca
Merge pull request #3719 from mxpv/lease_opts
Make client's WithLease more flexible
2019-10-04 17:06:59 -04:00
Maksym Pavlenko
e4e7e554d5 Make client's WithLease more flexible.
It's sometimes useful to specify a custom lease configuration. In this
case clients have to deal with LeaseManager manually to create/defer delete lease (essentially dup
WithLease logic). This PR adds lease opts to WithLease, so options
can be specified inline.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-10-04 12:22:16 -07:00
Michael Crosby
38a0013c70
Merge pull request #3711 from Random-Liu/avoid-unnecessary-runc-state
Use cached state instead of `runc state`.
2019-10-04 15:05:11 -04:00
Lantao Liu
18be6e3714 Use cached state instead of runc state.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-03 10:53:13 -07:00
Michael Crosby
be6bead423
Merge pull request #3712 from estesp/add-completion-docs
Add more detail on releases to README
2019-10-03 13:22:04 -04:00
Phil Estes
4c2d740a2a
Merge pull request #3713 from crosbymichael/runc-bump2
Bump runc to 1b8a1eeec3f337ab5d94f28980
2019-10-03 12:01:21 -04:00
Michael Crosby
f277665edb Bump runc to 1b8a1eeec3f337ab5d94f28980
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-03 10:36:35 -04:00
Phil Estes
e33f70385b
Add more detail on releases
Add more detail to the README.md where releases are found and also add
the documentation for how to use the new auto-completion capabilities
provided by urfave and enabled in a recent PR.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-10-03 09:52:03 -04:00
Phil Estes
309c9c25ba
Merge pull request #3706 from mrueg/enable-autocmpl
ctr: Enable shell autocompletion
2019-10-03 09:15:51 -04:00
Phil Estes
a83ae30016
Merge pull request #3681 from crosbymichael/bump-cgroups
Update cri and cgroup packages
2019-10-01 11:38:23 -04:00
Michael Crosby
8ff5827e98 Update cri and cgroup packages
This change includes a cri master bump and a cgroup bump for windows support
with cgroup stats and reusing the cgroup metric types.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-01 10:19:56 -04:00
Phil Estes
1009023783
Merge pull request #3705 from dmcgowan/limit-travis-release
Limit travis release script to a single build
2019-10-01 08:24:48 -04:00
Manuel Rüger
b5fa55b0c2 ctr: Enable shell autocompletion
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
2019-10-01 09:43:21 +02:00