Commit graph

39205 commits

Author SHA1 Message Date
Paul "TBBle" Hampson
35c531db1a Revendor Microsoft/go-winio for 8gB file fix
This pulls in the migration of go-winio/backuptar from the bundled fork
of archive/tar from Go 1.6 to using Go's current archive/tar unmodified.

This fixes the failure to import an OCI layer (tar stream) containing a
file larger than 8gB.

Fixes: #40444

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-09-19 23:13:44 +10:00
Paul "TBBle" Hampson
2dd9faaa16 Enable TestBuildWithHugeFile on Windows
This reproduces #40444, based on a suggestion from GitHub user @marosset

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-09-19 23:13:44 +10:00
Sebastiaan van Stijn
0bad48279e
Merge pull request #41463 from StefanScherer/win-investigate-cidut-out
Windows CI: Fix collecting the logs of the daemon under test
2020-09-19 15:00:25 +02:00
Sebastiaan van Stijn
0d75b63987
seccomp: replace types with runtime-spec types
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 19:33:58 +02:00
Tibor Vass
2513da195e
Merge pull request #41467 from thaJeztah/bump_go_digest
vendor: opencontainers/go-digest v1.0.0
2020-09-18 09:16:44 -07:00
Tibor Vass
1dff568d45
Merge pull request #41466 from thaJeztah/bump_libnetwork
vendor: docker/libnetwork d0951081b35fa4216fc4f0064bf065beeb55a74b
2020-09-18 09:16:05 -07:00
Sebastiaan van Stijn
0efee50b95
seccomp: move seccomp types from api into seccomp profile
These types were not used in the API, so could not come up with
a reason why they were in that package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 18:14:16 +02:00
Sebastiaan van Stijn
968133c86c
vendor: opencontainers/go-digest v1.0.0
full diff: https://github.com/opencontainers/go-digest/compare/v1.0.0-rc1...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 02:13:25 +02:00
Sebastiaan van Stijn
7cdced6f4b
vendor.conf: fix tar-split version comment
We already updated to v0.11.1, but didn't update the comment itself

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 02:09:45 +02:00
Sebastiaan van Stijn
9fb324f00b
vendor: docker/libnetwork d0951081b35fa4216fc4f0064bf065beeb55a74b
full diff: 9e99af28df...d0951081b3

- docker/libnetwork#2560 types: remove some dead code
- docker/libnetwork#2562 client/mflag: remove use of docker/docker/pkg/homedir
- docker/libnetwork#2576 Skip redundant kernel version checks
- docker/libnetwork#2583 vendor: update docker to 7ca355652f and reduce dependency graph

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 01:08:20 +02:00
Stefan Scherer
89bec2e267
Fix collecting the daemon under test logs
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-09-17 21:12:58 +02:00
Tibor Vass
7f7e4abb33
Merge pull request #41460 from thaJeztah/bump_gocapabilities
vendor: github.com/syndtr/gocapability 42c35b4376354fd554efc7ad35e0b7f94e3a0ffb
2020-09-17 11:42:49 -07:00
Brian Goff
3956a86b62
Merge pull request #41450 from thaJeztah/containerd_1.4.1
update containerd vendor and binary to v1.4.1
2020-09-17 08:01:44 -07:00
Sebastiaan van Stijn
ef6416f3b9
Merge pull request #40599 from olljanat/win-integration-fail-on-error
Windows CI: Make sure that CI fails on any error
2020-09-17 13:29:29 +02:00
Olli Janatuinen
82b5ff8026 Windows CI: Make sure that CI fails on any error
- If unit tests fails
- If intergration tests fails

Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2020-09-17 08:59:49 +03:00
Sebastiaan van Stijn
1ed6589e39
vendor: github.com/syndtr/gocapability 42c35b4376354fd554efc7ad35e0b7f94e3a0ffb
full diff: d98352740c...42c35b4376

Update Capabilities

- Add `CAP_PERFMON`
- Add `CAP_BPF`
- Add `CAP_CHECKPOINT_RESTORE`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 12:53:32 +02:00
Sebastiaan van Stijn
af3220884e
vendor: github.com/containerd/containerd v1.4.1
full diff: https://github.com/containerd/containerd/compare/v1.4.0...v1.4.1

Welcome to the v1.4.1 release of containerd!

The first patch release for `containerd` 1.4 includes a fix for v1 shims hanging
on exit and exec when the log pipe fills up along with other minor changes.

Notable Updates:

* Always consume shim logs to prevent logs in the shim from blocking
* Fix error deleting v2 bundle directory when removing rootfs returns `ErrNotExist`
* Fix metrics monitoring of v2 runtime tasks
* Fix incorrect stat for Windows containers
* Fix devmapper device deletion on rollback
* Update seccomp default profile

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 12:33:56 +02:00
Sebastiaan van Stijn
1371a629d5
update containerd binary to v1.4.1
full diff: https://github.com/containerd/containerd/compare/v1.4.0...v1.4.1

Welcome to the v1.4.1 release of containerd!

The first patch release for `containerd` 1.4 includes a fix for v1 shims hanging
on exit and exec when the log pipe fills up along with other minor changes.

Notable Updates:

* Always consume shim logs to prevent logs in the shim from blocking
* Fix error deleting v2 bundle directory when removing rootfs returns `ErrNotExist`
* Fix metrics monitoring of v2 runtime tasks
* Fix incorrect stat for Windows containers
* Fix devmapper device deletion on rollback
* Update seccomp default profile

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 12:33:45 +02:00
Brian Goff
f99814d749
Merge pull request #41448 from iamleot/stat_bsd
Unify same fromStatT() implementation for FreeBSD and NetBSD
2020-09-15 16:53:08 -07:00
Brian Goff
72fce23fc4
Merge pull request #41453 from thaJeztah/bump_moby_term
vendor: github.com/moby/term 7f0af18e79f2784809e9cef63d0df5aa2c79d76e
2020-09-15 15:56:26 -07:00
Brian Goff
a07c50dee8
Merge pull request #41445 from meidli/master
fix integration test case TestExternalGraphDriver failed in mips arch
2020-09-15 14:16:51 -07:00
Sebastiaan van Stijn
1155b6bc7a
Merge pull request #41395 from cpuguy83/no_libseccomp
Remove dependency in dockerd on libseccomp
2020-09-15 17:37:04 +02:00
Sebastiaan van Stijn
4ab96db4ab
vendor: github.com/moby/term 7f0af18e79f2784809e9cef63d0df5aa2c79d76e
full diff: 73f35e472e...7f0af18e79

- update gotest.tools to v3
- Use unix.Ioctl{Get,Set}Termios on all unix platforms
- Make Termios type alias, remove casts

vendor: golang.org/x/sys 196b9ba8737a10c9253b04174f25881e562da5b8

full diff: ed371f2e16...196b9ba873

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-15 16:12:46 +02:00
limeidan
2344b3a9e1 fix integration test case TestExternalGraphDriver failed in mips arch
Signed-off-by: limeidan <limeidan@loongson.cn>
2020-09-15 10:04:00 +08:00
Brian Goff
e8456cd207
Merge pull request #41447 from thaJeztah/daemon_errors
daemon/listeners: use pkg/errors
2020-09-14 13:29:03 -07:00
Leonardo Taccari
3d9120f744 Unify same fromStatT() implementation for FreeBSD and NetBSD
Suggested by Sebastiaan van Stijn, thanks!

Signed-off-by: Leonardo Taccari <leot@NetBSD.org>
2020-09-14 18:33:04 +02:00
Kirill Kolyshkin
41be7293f5
daemon/listeners: use pkg/errors
Co-Authored-By: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-14 14:50:54 +02:00
Sebastiaan van Stijn
f416e99a05
Merge pull request #41441 from iamleot/netbsd-from_stat_t
Add fromStatT() implementation for NetBSD
2020-09-14 14:31:47 +02:00
Brian Goff
bf6f0d82bc
Merge pull request #41360 from lzhfromustc/GL_5
Builder: Add 1 buffer to two channels to avoid blocking goroutine
2020-09-12 21:43:05 -07:00
Leonardo Taccari
6efa9e0575 Add support for NetBSD
Signed-off-by: Leonardo Taccari <leot@NetBSD.org>
2020-09-12 14:28:29 +02:00
Brian Goff
df7031b669 Memoize seccomp value for SysInfo
As it turns out, we call this function every time someone calls `docker
info`, every time a contianer is created, and every time a container is
started.
Certainly this should be refactored as a whole, but for now, memoize the
seccomp value.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-11 22:48:46 +00:00
Brian Goff
b83dc8e5a2 Remove libseccomp-golang from vendor
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-11 22:48:46 +00:00
Brian Goff
ccbb00c815 Remove dependency in dockerd on libseccomp
This was just using libseccomp to get the right arch, but we can use
GOARCH to get this.
The nativeToSeccomp map needed to be adjusted a bit for mipsle vs mipsel
since that's go how refers to it. Also added some other arches to it.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-11 22:48:42 +00:00
Brian Goff
c036d26f27
Merge pull request #41432 from edigaryev/api-memtotal-is-bytes
swagger: fix MemTotal units in SystemInfo endpoint
2020-09-11 14:44:56 -07:00
Tianon Gravi
dc72890470 Remove "mkimage.sh" and associated scripts
I looked at fixing https://bugs.debian.org/969940, but these scripts haven't been materially changed in 2-3 years and better alternatives exist elsewhere, so we should probably just remove them instead.

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2020-09-11 10:20:51 -07:00
Brian Goff
72c21a7e5d
Merge pull request #41436 from thaJeztah/replace_locker
replace pkg/locker with github.com/moby/locker
2020-09-11 10:18:44 -07:00
Justin Cormack
7ca355652f
Merge pull request #41337 from cyphar/apparmor-update-profile
apparmor: permit signals from unconfined programs
2020-09-11 12:05:40 +01:00
Sebastiaan van Stijn
ea2f17e7f4
Merge pull request #41431 from thaJeztah/bump_containerd
vendor: containerd v1.4.0
2020-09-11 01:37:16 +02:00
Sebastiaan van Stijn
4a44eaf41d
Merge pull request #41228 from cpuguy83/better_event_wait
Use IsServing to determine if c8d client is ready
2020-09-10 23:32:48 +02:00
Sebastiaan van Stijn
5ca758199d
replace pkg/locker with github.com/moby/locker
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-10 22:15:40 +02:00
Nikolay Edigaryev
13e0ba700a swagger: fix MemTotal units in SystemInfo endpoint
MemTotal represents bytes, not kilobytes. See Linux[1] and Windows[2]
implementations.

[1]: f50a40e889/pkg/system/meminfo_linux.go (L49)
[2]: f50a40e889/pkg/system/meminfo_windows.go (L40)

Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
2020-09-10 22:15:45 +03:00
Brian Goff
b9da78cef2
Merge pull request #41402 from thaJeztah/bump_selinux
vendor: github.com/opencontainers/selinux v1.6.0
2020-09-10 11:36:06 -07:00
Sebastiaan van Stijn
16eb522928
vendor: containerd v1.4.0
This is just to align to a tagged version, but given that the containerd
go-api is not considered "stable", we may switch back to a commit from
"master" at some point if needed.

No local changes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-10 12:26:15 +02:00
Paulo Gomes
a8e7115fca Simplify seccomp logic
Signed-off-by: Paulo Gomes <pjbgf@linux.com>
2020-09-09 18:23:27 +01:00
Sebastiaan van Stijn
65a33d02f6
Simplify getUser() to use libcontainer built-in functionality
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 13:25:59 +02:00
Sebastiaan van Stijn
f50a40e889
Merge pull request #41407 from Sixt/bug-41403
add partial metadata to journald logs
2020-09-08 12:20:54 +02:00
Brian Goff
ae0ef82b90
Merge pull request #41401 from thaJeztah/bump_mux
vendor: github.com/gorilla/mux v1.8.0
2020-09-01 11:59:02 -07:00
Christian Becker
322c9e6866 add partial metadata to journald logs
add all partial metadata available to journald logs to allow easier reassembly of partial messages in downstream logging systems

fixes #41403

Signed-off-by: Christian Becker <christian.becker@sixt.com>
2020-09-01 12:54:05 +02:00
Sebastiaan van Stijn
245f2d922a
vendor: github.com/opencontainers/selinux v1.6.0
full diff: https://github.com/opencontainers/selinux/compare/v1.5.2...v1.6.0

This also adds a new dependency: github.com/willf/bitset

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-31 15:29:05 +02:00
Sebastiaan van Stijn
fdd22e5628
vendor: github.com/gorilla/mux v1.8.0
full diff: https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-31 15:14:21 +02:00