Commit Graph

5312 Commits

Author SHA1 Message Date
Phil Estes
fdf7a795bc
Clarify requirements for identifiers validation
Fix commentary to be clear that the RFC1035 2.3.1 rules are not
explicitly enforced by the identifiers regex.

Add a test to show the lessened restrictions for digits to follow hyphen
and period.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-11-04 21:22:10 -05:00
Phil Estes
76aa4e546e
Use common identifiers package with less restrictive regex
Regular expressions in the namespaces package are redundant with the
pre-existing validator in the "identifiers" package; replace this custom
usage with the validator in "identifiers"

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-11-04 21:22:01 -05:00
Derek McGowan
4d7739527e
Merge pull request #3796 from crosbymichael/cgo
Add CGO makefile flag
2019-11-04 14:28:38 -08:00
Michael Crosby
84879b7c48 Add CGO makefile flag
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-11-04 16:25:58 -05:00
Michael Crosby
f9d8f0e56e
Merge pull request #3794 from fahedouch/server_test
add tests to server_test
2019-11-04 10:37:26 -05:00
fahedouch
7c016b655b
add tests to server_test
Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>
2019-11-04 09:15:05 -05:00
Maksym Pavlenko
257a7498d0
Merge pull request #3790 from ameyag/windows-shim-install
Windows process shim installer
2019-10-30 22:46:10 -07:00
Ameya Gawde
d21f0f116e
windows process shim installer
Signed-off-by: Ameya Gawde <ameya.gawde@docker.com>
2019-10-30 16:22:02 -07:00
Phil Estes
342ce3e602
Merge pull request #3789 from AkihiroSuda/vendor-20191030
bring back aufs and zfs
2019-10-30 12:29:13 +01:00
Akihiro Suda
a2688b972c bring back aufs and zfs
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-30 17:51:27 +09:00
Michael Crosby
4a1a1bc626
Merge pull request #3784 from tiborvass/ppc64
ppc64: -buildmode=pie is not supported
2019-10-29 11:23:32 -04:00
Michael Crosby
62b13256ef
Merge pull request #3786 from Random-Liu/not-found-error-if-no-platform
Return not found error if no platform matched.
2019-10-29 11:21:56 -04:00
Lantao Liu
78be736622 Return not found error if no platform matched.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-28 22:37:07 -07:00
Tibor Vass
d12b53a072 ppc64: -buildmode=pie is not supported
I needed this patch to compile containerd for ppc64.

Signed-off-by: Tibor Vass <tibor@docker.com>
2019-10-28 22:47:47 +00:00
Michael Crosby
cedd3cb16c
Merge pull request #3782 from mrueg/vndr-autocompl
Makefile: Drop vndr whitelist
2019-10-28 11:28:36 -04:00
Manuel Rüger
5e5584196b
Makefile: Drop vndr whitelist
Since autocompletions moved to contrib/ in
https://github.com/containerd/containerd/pull/3766

Signed-off-by: Manuel Rüger <manuel@rueg.eu>
2019-10-28 15:16:45 +01:00
Michael Crosby
edb6f2344a
Merge pull request #3780 from AkihiroSuda/1.1-eol
RELEASES.md: 1.1 EOL
2019-10-28 10:10:16 -04:00
Phil Estes
aeec80fca1
Merge pull request #3773 from Random-Liu/use-logrus-trace
Use logrus trace support.
2019-10-25 07:45:31 -04:00
Lantao Liu
20e844a227 Use logrus trace support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-24 20:12:19 -07:00
Akihiro Suda
0c01992f9c
Merge pull request #3709 from Zyqsempai/3708-added-filters-to-shapsotters-api
Added filters to snapshots API
2019-10-25 11:52:20 +09:00
Derek McGowan
66aa1d3ef6
Add snapshot walk implementations
Temporarily remove zfs and aufs until interface update

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-24 11:11:22 -07:00
bpopovschi
e8c14c07c6
Added filters to snapshots API
Signed-off-by: bpopovschi <zyqsempai@mail.ru>
2019-10-24 11:11:22 -07:00
Phil Estes
c59561a08e
Merge pull request #3763 from AkihiroSuda/disable-mknod00-in-userns
apply: use naive applier when running in UserNS
2019-10-24 14:06:37 -04:00
Phil Estes
f05e19c5c6
Merge pull request #3777 from Random-Liu/fix-containerd-config
Fix `containerd config dump`.
2019-10-24 11:50:15 -04:00
Akihiro Suda
f593efdf0c RELEASES.md: 1.1 EOL
v1.1 reached EOL on October 23, 2019

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-24 19:38:49 +09:00
Lantao Liu
aaccfcbe2b Fix containerd config dump.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-23 22:38:18 -07:00
Akihiro Suda
c224edc5c6 apply: use naive applier when running in UserNS
`OverlayConvertWhiteout` calls `mknod c 0 0` which is not allowed when
running in a user namespace, even in Ubuntu kernel.

Although there is an alternative hacky way to create whiteouts without
calling mknod as Moby `overlay2` actually does(see #3762), let's use
naive applier when running in UserNS and call it a day.

Close #3762

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-24 13:33:09 +09:00
Akihiro Suda
966b1b8e30
Merge pull request #3775 from jterry75/vendor_hcsshim
Update Microsoft/hcsshim vendor
2019-10-24 12:15:23 +09:00
Justin Terry (VM)
37b56cafc6 Add ctr metrics support for Windows/LCOW containers
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-10-23 13:50:34 -07:00
Justin Terry (VM)
178469e2ae Update Microsoft/hcsshim vendor
Updates Microsoft/hcsshim vendor commit hash to a recent version that now:
1. Supports container stats via the Stats RuntimeV2 gRPC call.
2. Fixes a regression when issuing a resize of the pty after the container has
exited which previously in Docker was expected to be a non-error case.
3. Puts in a workaround when using a non-default sandbox size for Windows
containers due to a platform bug. This expansion now happens in the go library
itself.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-10-23 11:48:43 -07:00
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