Commit graph

1899 commits

Author SHA1 Message Date
Sebastiaan van Stijn
225f764652
vendor: golang.org/x/sync 036812b2e83c0ddf193dd5a34e034151da389d09
full diff: 6e8e738ad2...036812b2e8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-15 16:20:44 +02:00
Sebastiaan van Stijn
037c26d863
vendor: golang.org/x/net e18ecbb051101a46fc263334b127c89bc7bff7ea
full diff: 6772e930b6...e18ecbb051

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-15 16:20:42 +02:00
Sebastiaan van Stijn
e1ae2d28fb
vendor: golang.org/x/time 3af7569d3a1e776fc2a3c1cec133b43105ea9c2e
full diff: 555d28b269...3af7569d3a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-15 16:20:40 +02:00
Sebastiaan van Stijn
28156f4a2e
vendor: golang.org/x/crypto 0c34fe9e7dc2486962ef9867e3edb3503537209f
full diff: c1f2f97bff...0c34fe9e7d

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-15 16:20:37 +02:00
Adam Williams
13828e430d Bump swarmkit to get fix for rollback failure
Signed-off-by: Adam Williams <awilliams@mirantis.com>
2021-06-10 09:29:09 -07:00
Sebastiaan van Stijn
3ed804aeca
updated vendored archive/tar to go1.16.5
result of: `hack/vendor.sh archive/tar`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-10 13:04:50 +02:00
Justin Cormack
f45ca809a6
Merge pull request #42478 from thaJeztah/bump_selinux
vendor: github.com/opencontainers/selinux v1.8.2
2021-06-10 10:52:02 +01:00
Sebastiaan van Stijn
08ddbfbdac
libcontainerd: remove LCOW bits
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-09 22:05:10 +02:00
Sebastiaan van Stijn
b6052669e6
vendor: swarmkit master (after libnetwork move)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-08 22:47:33 +02:00
Brian Goff
a7ea29a5a6
Merge pull request #42451 from thaJeztah/remove_lcow_step1
Remove LCOW code (step 1)
2021-06-08 13:41:45 -07:00
Sebastiaan van Stijn
22186d2645
vendor: github.com/opencontainers/selinux v1.8.2
full diff:

- https://github.com/opencontainers/selinux/compare/v1.8.0...v1.8.2
- https://github.com/bits-and-blooms/bitset/compare/v1.1.11...v1.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-07 10:09:21 +02:00
Sebastiaan van Stijn
7c1c123555
vendor: github.com/containerd/containerd v1.5.2
full diff: 19ee068f93...v1.5.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-04 16:32:37 +02:00
Sebastiaan van Stijn
989cd6e8f6
vendor: github.com/containerd/typeurl v1.0.2
Fixes locking for getTypeByUrl

full diff: https://github.com/containerd/typeurl/compare/v1.0.1...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-04 16:27:41 +02:00
Sebastiaan van Stijn
0691addf6a
vendor: github.com/containerd/cgroups v1.0.1
full diff: 0b889c03f1...v1.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-04 16:27:37 +02:00
Sebastiaan van Stijn
134b73a1ea
vendor: github.com/containerd/continuity v0.1.0
full diff: efbc4488d8...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-04 16:27:35 +02:00
Sebastiaan van Stijn
bfb5b8017b
vendor: github.com/containerd/fifo v1.0.0
full diff: 0724c46b32...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-04 16:27:05 +02:00
Akihiro Suda
33c332ad19
Merge pull request #42143 from thaJeztah/check_libcontainer
vendor: github.com/opencontainers/runc v1.0.0-rc95
2021-06-04 14:00:13 +09:00
Sebastiaan van Stijn
e047d984dc
Remove LCOW code (step 1)
The LCOW implementation in dockerd has been deprecated in favor of re-implementation
in containerd (in progress). Microsoft started removing the LCOW V1 code from the
build dependencies we use in Microsoft/opengcs (soon to be part of Microsoft/hcshhim),
which means that we need to start removing this code.

This first step removes the lcow graphdriver, the LCOW initialization code, and
some LCOW-related utilities.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-03 21:16:21 +02:00
Sebastiaan van Stijn
a927fc7831
vendor: github.com/opencontainers/runc v1.0.0-rc95
full diff: https://github.com/opencontainers/runc/compare/v1.0.0-rc92...v1.0.0-rc95

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-02 17:55:49 +02:00
Sebastiaan van Stijn
f0d3e905b6
vendor: golang.org/x/sys d19ff857e887eacb631721f188c7d365c2331456
full diff: b64e53b001...d19ff857e8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-02 17:55:47 +02:00
Sebastiaan van Stijn
8db4c4ca01
vendor: golang.org/x/net 6772e930b67bb09bf22262c7378e7d2f67cf59d1
full diff: ab34263943...6772e930b6

- http/httpproxy: match http scheme when selecting http_proxy
- drop support for pre-1.12 direct syscalls on darwin
- x/net/http2: reject HTTP/2 Content-Length headers containing a sign
- http2/h2i: use x/term instead of x/crypto/ssh/terminal

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-02 17:55:44 +02:00
Sebastiaan van Stijn
b7dbed85b3
vendor: github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
full diff: 4d89ac9fbf...1c3f411f04

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-02 17:55:42 +02:00
Sebastiaan van Stijn
56481e899d
vendor: github.com/cilium/ebpf v0.5.0
full diff: 1c8d4c9ef7...v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-02 17:55:40 +02:00
Sebastiaan van Stijn
473817206e
vendor: rename ebpf README
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-02 17:55:39 +02:00
Sebastiaan van Stijn
6c954ffd32
vendor: temp rename ebpf readme
To help with a case-only rename of readme -> README

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-02 17:55:36 +02:00
Brian Goff
e837dd0fb8 Add urfave/cli for libnetwork cmd's
After moving libnetwork we have a few extra cmd's.
Some of these are using urfave/cli so we need to vendor that in.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 22:14:21 +00:00
Brian Goff
94017da880 Use buildkit fork which uses new libnetwork import
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 22:12:00 +00:00
Brian Goff
7abc3e83c9 Use tmp swarmkit fork for libnetwork import
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 21:51:37 +00:00
Sebastiaan van Stijn
7c6a9484ee
Merge pull request #42424 from thaJeztah/bump_buildkit2
vendor: github.com/moby/buildkit v0.8.3-3-g244e8cde
2021-06-01 19:49:42 +02:00
Sebastiaan van Stijn
61b04b3a02
vendor: github.com/moby/buildkit v0.8.3-3-g244e8cde
full diff: https://github.com/moby/buildkit/compare/v0.8.3...v0.8.3-3-g244e8cde

- Transform relative mountpoints for exec mounts in the executor
- Add test for handling relative mountpoints

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-31 16:06:58 +02:00
Sebastiaan van Stijn
8e2ec0b536
Merge pull request #42418 from sparrc/update-fluent-logger
vendor: github.com/fluent/fluent-logger-golang 1.6.1
2021-05-27 14:57:16 +02:00
Sebastiaan van Stijn
79ee285d76
vendor: github.com/moby/buildkit v0.8.3
full diff: https://github.com/moby/buildkit/compare/v0.8.2...v0.8.3

- vendor containerd (required for rootless overlayfs on kernel 5.11)
    - not included to avoid depending on a fork
- Add retry on image push 5xx errors
- contenthash: include basename in content checksum for wildcards
- Fix missing mounts in execOp cache map
- Add regression test for run cache not considering mounts
- Add hack to preserve Dockerfile RUN cache compatibility after mount cache bugfix

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-26 13:33:04 +02:00
Cam
a6a98d6928
vendor: github.com/fluent/fluent-logger-golang 1.6.1
Updates the fluent logger library. Namely this fixes a couple places
where the library could panic when closing and writing to channels.

see https://github.com/fluent/fluent-logger-golang/pull/93 and
https://github.com/fluent/fluent-logger-golang/pull/95

closes #40829
closes #32567

Signed-off-by: Cam <gh@sparr.email>
2021-05-25 15:42:49 -07:00
Sebastiaan van Stijn
22b9e2a7e5
vendor: github.com/ishidawataru/sctp f2269e66cdee387bd321445d5d300893449805be
full diff: 6e2cb13661...f2269e66cd

- support SO_SNDBUF/SO_RCVBUF handling
- Support Go Modules
- license clarificaton
- ci: drop 1.6, 1.7, 1.8 support
- Add support for SocketConfig
- support goarch mips64le architecture.
- fix possible socket leak when bind fails

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-25 11:36:11 +02:00
Sebastiaan van Stijn
e4109b3b6b
vendor: github.com/docker/libnetwork 64b7a4574d1426139437d20e81c0b6d391130ec8
Update libnetwork to make `docker run -p 80:80` functional again on environments
with kernel boot parameter `ipv6.disable=1`.

full diff: b3507428be...64b7a4574d

- fix port forwarding with ipv6.disable=1
    - fixes moby/moby/42288 Docker 20.10.6: all containers stopped and cannot start if ipv6 is disabled on host
    - fixes docker/libnetwork/2629 Network issue with IPv6 following update to version 20.10.6
    - fixesdocker/for-linux/1233 Since 20.10.6 it's not possible to run docker on a machine with disabled IPv6 interfaces
- vendor: github.com/ishidawataru/sctp f2269e66cdee387bd321445d5d300893449805be
- Enforce order of lock acquisitions on network/controller, fixes #2632
    - fixes docker/libnetwork/2632 Name resolution stuck due to deadlock between different network struct methods
    - fixes moby/moby/42032 Docker deamon get's stuck, can't serve DNS requests

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-25 11:33:19 +02:00
Brian Goff
5a2364d651
Merge pull request #42361 from thaJeztah/bump_systemd_dbus 2021-05-06 11:05:02 -07:00
Brian Goff
cbe2f7a661
Merge pull request #42284 from thaJeztah/update_containerd_console
vendor: github.com/containerd/console v1.0.2
2021-05-06 11:02:14 -07:00
Sebastiaan van Stijn
3987dc264b
vendor: github.com/godbus/dbus/v5 v5.0.4
full diff: https://github.com/godbus/dbus/compare/v5.0.3...v5.0.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-06 16:16:50 +02:00
Sebastiaan van Stijn
7a956d1342
vendor: github.com/coreos/go-systemd/v22 v22.3.1
full diff: https://github.com/coreos/go-systemd/compare/v22.1.0...v22.3.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-06 16:16:47 +02:00
Sebastiaan van Stijn
8844c48523
vendor: github.com/moby/sys/mountinfo v0.4.1, github.com/moby/sys/mount v0.2.0+
full diff: https://github.com/moby/sys/compare/symlink/v0.1.0...mountinfo/v0.4.1

github.com/moby/sys/mountinfo v0.4.1
----------------------------------------------

- Fix PrefixFilter() being too greedy
- TestMountedBy*: add missing pre-checks
- Documentation improvements

github.com/moby/sys/mount v0.2.0
----------------------------------------------

Breaking changes:

- Remove stub-implementations for Windows for `Mount()`, `Unmount()`,
  `RecursiveUnmount()`, `MergeTmpfsOptions()`

Fixes and improvements:

- `go.mod`: update github.com/moby/sys/mountinfo to v0.4.0
- use `MNT_*` flags from golang.org/x/sys/unix on freebsd
- add support for OpenBSD in addition to FreeBSD
- fix package overview documentation not showing
- `RecursiveUnmount()`: minor improvements

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-04 17:42:48 +02:00
Adam Williams
42a485f7fa Update Microsoft/go-winio to version 0.4.19
Signed-off-by: Adam Williams <awilliams@mirantis.com>
2021-04-26 10:02:58 -07:00
Sebastiaan van Stijn
1c7585a7da
vendor: github.com/docker/swarmkit 5a5494a9a7b408b790533a5e4e1cb43ca1c32aad
full diff: 17d8d4e4d8...5a5494a9a7

Updated version of SwarmKit with protos generated with gogo/protobuf v1.3.2
due to CVE-2021-3121 reported on gogo/protobuf version 1.3.1, CVE has been
fixed for version 1.3.2

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3121

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-20 23:46:35 +02:00
Sebastiaan van Stijn
2bef937507
vendor: github.com/coreos/etcd v3.3.25
full diff: https://github.com/coreos/etcd/compare/v3.3.12...v3.3.25

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-20 23:46:33 +02:00
Sebastiaan van Stijn
6202322b60
vendor: github.com/containerd/containerd 19ee068f93c91f7b9b2a858457f1af2cabc7bc06
full diff: 55eda46b22...19ee068f93

brings in updated protobufs, generated with gogo/protobuf v1.3.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-20 23:46:31 +02:00
Sebastiaan van Stijn
8b385fde57
vendor: github.com/gogo/protobuf v1.3.2
full diff: https://github.com/gogo/protobuf/compare/v1.3.1...v1.3.2

bump version 1.3.2 for gogo/protobuf due to CVE-2021-3121 reported on
gogo/protobuf version 1.3.1, CVE has been fixed for version 1.3.2

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3121

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-20 23:46:27 +02:00
Tianon Gravi
72fef53cec
Merge pull request #42270 from cpuguy83/bump_hcsshim
Bump hcsshim to get some fixes.
2021-04-20 14:42:29 -07:00
Sebastiaan van Stijn
948e201c1c
vendor: github.com/containerd/console v1.0.2
Contains fix for s390x and support for FreeBSD

full diff: https://github.com/containerd/console/compare/v1.0.1...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-12 15:31:21 +02:00
Tibor Vass
68bec0fcf7
Merge pull request #42276 from thaJeztah/apparmor_detect_fix
Use containerd's apparmor package to detect if apparmor can be used
2021-04-09 16:09:54 -07:00
Sebastiaan van Stijn
1cb7ee4cd9
Merge pull request #42246 from thaJeztah/replace_toml
Replace BurntSushi/toml with pelletier/go-toml
2021-04-08 21:13:11 +02:00
Sebastiaan van Stijn
2834f842ee
Use containerd's apparmor package to detect if apparmor can be used
The runc/libcontainer apparmor package on master no longer checks if apparmor_parser
is enabled, or if we are running docker-in-docker.

While those checks are not relevant to runc (as it doesn't load the profile), these
checks _are_ relevant to us (and containerd). So switching to use the containerd
apparmor package, which does include the needed checks.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 20:22:08 +02:00
Sebastiaan van Stijn
42ef2c5036
vendor: github.com/containerd/containerd 55eda46b22f985cde99b599e469ff9c13994bf68
This patch picks the first commit in containerd that exports the AppArmor package
functions to keep the vendor diff small (there are some updates to that package
after this, but those will be included in other patches).

full diff: fbf1a72de7...55eda46b22

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 20:22:06 +02:00
Sebastiaan van Stijn
928227a456
vendor: golang.org/x/sync 6e8e738ad208923de99951fe0b48239bfd864f28
full diff: cd5d95a43a...6e8e738ad2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 17:15:12 +02:00
Sebastiaan van Stijn
e538720da7
vendor: github.com/coreos/go-systemd/v22 v22.1.0
no local changes

full diff: https://github.com/coreos/go-systemd/compare/v22.0.0...v22.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 17:15:01 +02:00
Sebastiaan van Stijn
5761fca80d
vendor: github.com/containerd/containerd fbf1a72de7da110187b7d3dace433914b9beca10
This is the first commit after the containerd transition to go modules. Using this
as an intermediate version to allow us to track what dependency changes are
introduced in the containerd dependency since.

full diff: b9092fae15...fbf1a72de7

There were some fix-ups in the PR after adding go modules that updated dependencies,
which will be aligned in the next commit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 16:21:01 +02:00
Sebastiaan van Stijn
ab1dd80877
vendor: github.com/containerd/containerd b9092fae15f1814a5402bea1ceb0fa21ce1c785c
This is the last commit before containerd switched to using go modules. Using this
as an intermediate version to allow us to more easily track what dependency updates
containerd has.

full diff: 0edc412565...b9092fae15

relevant changes in vendored code:

- Do not hardcode "amd64" on LCOW and Windows-related files
- Optimize Windows and LCOW snapshotters to only create scratch layer on the final snapshot
- Add annotations to task update request api

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 16:14:02 +02:00
Brian Goff
452f82d5fc Bump hcsshim to get some fixes.
This also requires bumping winio.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-04-07 22:45:33 +00:00
Sebastiaan van Stijn
2a7c1cc1d6
libcontainerd/supervisor: replace BurntSushi/toml with pelletier/go-toml
Taking the same approach as was taken in containerd

The new library has a slightly different output;

- keys at the same level are sorted alphabetically
- empty sections not omitted (`proxy_plugins`, `stream_processors`, `timeouts`),
  which could possibly be be addressed with an "omitempty" in containerd's struct.
- empty slices are not omitted (`imports`, `required_plugins`)

After sorting the "before" configuration the diff looks like this:

```patch
diff --git a/config-before-sorted.toml b/config-after.toml
index cc771ce7ab..43a727f589 100644
--- a/config-before-sorted.toml
+++ b/config-after.toml
@@ -1,6 +1,8 @@
 disabled_plugins = ["cri"]
+imports = []
 oom_score = 0
 plugin_dir = ""
+required_plugins = []
 root = "/var/lib/docker/containerd/daemon"
 state = "/var/run/docker/containerd/daemon"
 version = 0
@@ -37,6 +39,12 @@ version = 0
     shim = "containerd-shim"
     shim_debug = true

+[proxy_plugins]
+
+[stream_processors]
+
+[timeouts]
+
 [ttrpc]
   address = ""
   gid = 0
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-02 17:42:57 +02:00
Sebastiaan van Stijn
0450728267
vendor: docker/libnetwork b3507428be5b458cb0e2b4086b13531fb0706e46
full diff: fa125a3512...b3507428be

- fixed IPv6 iptables rules for enabled firewalld (libnetwork#2609)
    - fixes "Docker uses 'iptables' instead of 'ip6tables' for IPv6 NAT rule, crashes"
- Fix regression in docker-proxy
    - introduced in "Fix IPv6 Port Forwarding for the Bridge Driver" (libnetwork#2604)
    - fixes/addresses: "IPv4 and IPv6 addresses are not bound by default anymore" (libnetwork#2607)
    - fixes/addresses "IPv6 is no longer proxied by default anymore" (moby#41858)
- Use hostIP to decide on Portmapper version
    - fixes docker-proxy not being stopped correctly

Port mapping of containers now contain separatet mappings for IPv4 and IPv6 addresses, when
listening on "any" IP address. Various tests had to be updated to take multiple mappings into
account.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-25 00:19:35 +01:00
Sebastiaan van Stijn
fb886a119b
vendor: github.com/spf13/cobra v1.1.3
full diff: https://github.com/spf13/cobra/compare/v1.1.1...v1.1.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-14 18:59:06 +01:00
Brian Goff
4f36654057
Merge pull request #41506 from thaJeztah/bump_coreos_pkg
vendor: github.com/coreos/pkg v4
2021-03-12 12:52:55 -08:00
Tibor Vass
3c9b4a63b5
Merge pull request #42056 from thaJeztah/bump_buildkit
vendor: github.com/moby/buildkit v0.8.2
2021-02-24 22:26:53 -08:00
Sebastiaan van Stijn
9962a3f74e vendor: github.com/moby/buildkit v0.8.2
full diff: 68bb095353...9065b18ba4

- fix seccomp compatibility in 32bit arm
    - fixes Unable to build alpine:edge containers for armv7
    - fixes Buildx failing to build for arm/v7 platform on arm64 machine
- resolver: avoid error caching on token fetch
    - fixes "Error: i/o timeout should not be cached"
- fileop: fix checksum to contain indexes of inputs
- frontend/dockerfile: add RunCommand.FlagsUsed field
    - relates to [20.10] Classic builder silently ignores unsupported Dockerfile command flags
- update qemu emulators
    - relates to "Impossible to run git clone inside buildx with non x86 architecture"
- Fix reference count issues on typed errors with mount references
    - fixes errors on releasing mounts with typed execerror refs
    - fixes / addresses invalid mutable ref when using shared cache mounts
- dockerfile/docs: fix frontend image tags
- git: set token only for main remote access
    - fixes "Loading repositories with submodules is repeated. Failed to clone submodule from googlesource"
- allow skipping empty layer detection on cache export

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Tibor Vass <tibor@docker.com>
2021-02-25 01:25:55 +00:00
Adam Williams
cbd2f726bf Update Swarmkit to pick up fixes to heartbeat period and stalled tasks
Signed-off-by: Adam Williams <awilliams@mirantis.com>
2021-02-22 10:32:08 -08:00
Tibor Vass
28a623aa3a
vendor buildkit 68bb095353c65bc3993fd534c26cf77fe05e61b1
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 4afe620fac)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-02-02 13:27:03 +01:00
Brian Goff
3e0025e2fc
Merge pull request #41689 from thaJeztah/switch_hcsshim
vendor: update github.com/Microsoft/hcsshim v0.8.10 (back to tagged release)
2021-01-28 13:34:58 -08:00
Tibor Vass
7ca0cb7ffa Use golang.org/x/sys/execabs
Signed-off-by: Tibor Vass <tibor@docker.com>
2021-01-25 19:13:12 +00:00
Sebastiaan van Stijn
1c0af18c6c
vendor: opencontainers/selinux v1.8.0, and remove selinux build-tag and stubs
full diff: https://github.com/opencontainers/selinux/compare/v1.7.0...v1.8.0

Remove "selinux" build tag

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-12-24 00:47:16 +01:00
Tibor Vass
249d0ab744
Merge pull request #41805 from arkodg/vendor-libnetwork-ipv6-port-forwarding
Vendor in Libnetwork changes
2020-12-23 08:49:46 -08:00
Sebastiaan van Stijn
ab06bb3ec0
vendor: opencontainers/selinux v1.7.0
full diff: https://github.com/opencontainers/selinux/compare/v1.6.0...v1.7.0

- Implement get_default_context_with_level() from libselinux
- Wrap some syscalls (lgetattr, lsetattr, fstatfs, statfs) to retry on EINTR.
- Improve code quality by turning fixing many problems found by linters
- Use bufio.Scanner for parsing labels and policy confilabelg
- Cache the value for SELinux policy directory
- test on ppc64le and go 1.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-12-22 13:57:09 +01:00
Brian Goff
b91193d0cb
Merge pull request #41708 from thaJeztah/bump_gotest_tools_v3.0.3
vendor: gotest.tools v3.0.3
2020-12-15 16:06:05 -08:00
Arko Dasgupta
78eafdd947 Vendor in Libnetwork changes
Brings in https://github.com/moby/libnetwork/pull/2604

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2020-12-15 10:22:03 -08:00
Tibor Vass
a02553670e vendor buildkit to v0.8.1
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-12-15 02:06:55 +00:00
Arko Dasgupta
5fd8d701ce Vendor in libnetwork changes
Vendor in IP6Tables fixes

https://github.com/moby/libnetwork/pull/2600
https://github.com/moby/libnetwork/pull/2603

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2020-12-11 10:52:32 -08:00
Akihiro Suda
eeddea2f90
Merge pull request #41747 from thaJeztah/fix_missing_dependency
vendor: remove vendored golang.org/x/tools, as it's not needed
2020-12-08 00:55:12 +09:00
Akihiro Suda
34682e536e vendor: BuildKit 950603da215ae03b843f3f66fbe86c4876a6f5a1
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-12-04 21:42:51 +00:00
Sebastiaan van Stijn
15accb8376
vendor: remove vendored golang.org/x/tools, as it's not needed
This dependency was added in 6cdbf07be9d0ad08776df0b65fb1b3e4e617c42a,
but looks like the code was vendored manually, or vendored, then removeed
from vendor.conf.

This commit removes the vendored files, as they are not needed to build
our binaries.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-12-03 18:04:16 +01:00
Akihiro Suda
ab373df112
Merge pull request #41688 from thaJeztah/bump_buildkit
vendor: BuildKit v0.8.0-rc2, containerd, and dependencies
2020-12-03 19:27:54 +09:00
Tibor Vass
22e31dbd9a vendor libnetwork to fix mix up between IPv4 and IPv6
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-24 23:22:31 +00:00
Sebastiaan van Stijn
776cadc7db
vendor: gotest.tools v3.0.3
- assert: fixes a bug that would cause a panic if there were any
  function calls before `assert.Check` on the same line
- golden: create the directory if it does not exist, when run with
  `-test.update-golden`

full diff: https://github.com/gotestyourself/gotest.tools/compare/v3.0.2...v3.0.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-23 12:33:57 +01:00
Sebastiaan van Stijn
73571e4689
vendor: github.com/moby/buildkit v0.8.0-rc2
full diff: 6861f17f15...v0.8.0-rc2

- dockerfile: rename experimental channel to labs
- dockerfile build: fix not exit when meet error in load config metadata
- copy containerd.UnknownExitStatus to local const to reduce dependency graph in client
- executor: switch to docker seccomp profile
- add retry handlers to push/pull
- SSH-based auth for llb.Git operations
- Allow gateway exec-ing into a failed solve with an exec op
- Fix parsing ssh-based git sources
- Fix sshkeyscan to work with ipv6
- fix assumption that ssh port must be 2 digits
- vendor: github.com/Microsoft/go-winio v0.4.15
- vendor: github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85
- vendor: containerd v1.4.1-0.20201117152358-0edc412565dc
- vendor: golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 10:31:35 +01:00
Sebastiaan van Stijn
1f88736871
vendor: github.com/containerd/containerd 0edc412565dcc6e3d6125ff9e4b009ad4b89c638
full diff: d4e78200d6...0edc412565

- integrates containerd/cri into main containerd repository
- seccomp: add `pidfd_open` and `pidfd_send_signal`
- seccomp: add `pidfd_getfd` syscall (gated by `CAP_SYS_PTRACE`)
- docker: don’t hide pusher response error

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 10:30:54 +01:00
Sebastiaan van Stijn
8eebe32f5c
vendor: github.com/containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510
full diff: 318312a373...0b889c03f1

- v1/stats: add all fields of memory.oom_control
- memory: remove wrong memory.kmem.limit_in_bytes check
- CI: test against Go 1.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 10:30:52 +01:00
Sebastiaan van Stijn
ba475d44a7
vendor: github.com/containerd/fifo 0724c46b320cf96bb172a0550c19a4b1fca4dacb
full diff: f15a329036...0724c46b32

- Add OpenFifoDup2
- use golang.org/x/sys/unix for dup2 (fixes build on arm64)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 10:30:50 +01:00
Sebastiaan van Stijn
37da117aba
vendor: github.com/containerd/ttrpc v1.0.2
full diff: https://github.com/containerd/ttrpc/compare/v1.0.1...v1.0.2

- fix bug, failed to assert net error due to error wrap
    - fixes: ttrpc client receive "read: connection reset by peer: unknown"
- client: add UserOnCloseWait function
- travis: add go 1.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 10:30:48 +01:00
Sebastiaan van Stijn
1725a1493e
vendor github.com/tonistiigi/fsutil 0834f99b7b85462efb69b4f571a4fa3ca7da5ac9
c3ed55f3b4...0834f99b7b

- copy: use Clonefileat from golang.org/x/sys/unix on macOS
- go.mod: update opencontainers/go-digest v1.0.0
- Add github action CI
- github: test go1.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 10:30:45 +01:00
Sebastiaan van Stijn
fa592fa7b2
vendor: golang.org/x/crypto c1f2f97bffc9c53fc40a1a28a5b460094c0050d9
full diff: 75b288015a...c1f2f97bff

relevant changes:

- pkcs12: document that we use the wrong PEM type
- pkcs12: drop PKCS#12 attributes with unknown OIDs
- ocsp: Improve documentation for ParseResponse and ParseResponseForCert

other changes (not in vendor);

- ssh: improve error message for KeyboardInteractiveChallenge
- ssh: remove slow unnecessary diffie-hellman-group-exchange primality check
- ssh/terminal: replace with a golang.org/x/term wrapper
    - Deprecates ssh/terminal in favor of golang.org/x/term
- ssh/terminal: add support for zos
- ssh/terminal: bump x/term dependency to fix js/nacl
- nacl/auth: use Size instead of KeySize for Sum output
- sha3: remove go:nocheckptr annotation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 10:30:16 +01:00
Sebastiaan van Stijn
c7f0b509cf
vendor: github.com/moby/term bea5bbe245bf407372d477f1361d2ff042d2f556
full diff: 7f0af18e79...bea5bbe245

- Fix windows integer overflow on GOOS=windows, GOARCH=arm
- go.mod: github.com/creack/pty v1.1.11
  - v1.1.11: Add arm support for OpenBSD
  - v1.1.10: Fix CTTY to work with go1.15
- CI: fix Go version matrix, and drop go 1.12, add go 1.15
- CI: remove "sudo" to fix incorrect Go versions (incorrect PATH, GOROOT)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 00:29:13 +01:00
Sebastiaan van Stijn
27801b9ef8
vendor: update github.com/Microsoft/hcsshim v0.8.10 (back to tagged release)
This switches the hcsshim dependency back to tagged releases, instead of the special
"moby" branch. This makes the dependency align with both BuildKit and containerd,
which use these versions.

The switch to the "moby" branch was done in 2865478487,
to bring in a fix for image import, without having to bring in additional changes;

> We changed to the moby branch for a couple of reasons:
>
> - Allows us to take this important change without needing to also pull in all
>   of the other work that has been going on in the repo.
> - moby uses an older set of APIs exposed from hcsshim, based on the HCS v1
>   functionality. Going forwards, we have discussed deprecating/removing these
>   APIs from the mainline branch in hcsshim, so our thinking was we could keep
>   this moby branch around to ensure we don't break compatibility there.
>
> (...) Long term, the best path here is to get moby using containerd as the
> backend on Windows, which should alleviate these issues.

full diff: 9dcb42f100..v0.8.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-18 11:49:55 +01:00
Ameya Gawde
2630994b35
Bump libnetwork
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
2020-11-17 16:03:27 -08:00
Tibor Vass
cf0ce96eb1
Merge pull request #41601 from tiborvass/bk_vendor
vendor buildkit 6861f17f15364de0fe1fd1e6e8da07598a485123
2020-11-16 21:22:12 -08:00
Tibor Vass
de56a90929 vendor buildkit 6861f17f15364de0fe1fd1e6e8da07598a485123
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-14 03:57:36 +00:00
Tibor Vass
4217958ca6
Merge pull request #41629 from thaJeztah/bump_pty
vendor: github.com/creack/pty v1.1.11 (includes fixes for go 1.15)
2020-11-12 21:55:26 -08:00
Brian Goff
e11cabe558
Merge pull request #41554 from thaJeztah/bump_cobra
vendor: github.com/spf13/cobra v1.1.1
2020-11-09 09:37:31 -08:00
Sebastiaan van Stijn
c90671b4cd
Merge pull request #41604 from arkodg/bump-libnetwork-ipv6nat
Vendor in Libnetwork changes
2020-11-05 15:57:32 +01:00
Sebastiaan van Stijn
53727ce2f0
vendor: github.com/creack/pty v1.1.11
full diff: https://github.com/creack/pty/compare/v1.1.9...v1.1.11

- v1.1.11: Add arm support for OpenBSD
- v1.1.10: Fix CTTY to work with go1.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-03 13:38:27 +01:00
Sebastiaan van Stijn
dc3c382b34
replace pkg/symlink with github.com/moby/sys/symlink
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-03 11:17:12 +01:00
Akihiro Suda
0b93c6e131
Merge pull request #41458 from thaJeztah/bump_mountinfo
vendor: moby/sys mountinfo/v0.4.0
2020-11-03 16:39:18 +09:00
Tibor Vass
7bb1944edb
Merge pull request #41573 from thaJeztah/bump_sys
vendor: golang.org/x/sys eeed37f84f13f52d35e095e8023ba65671ff86a1
2020-11-02 09:44:25 -08:00
Sebastiaan van Stijn
32d506b394
vendor: moby/sys mountinfo/v0.4.0
full diff: https://github.com/moby/sys/compare/mountinfo/v0.1.3...mountinfo/v0.4.0

> Note that this dependency uses submodules, providing "github.com/moby/sys/mount"
> and "github.com/moby/sys/mountinfo". Our vendoring tool (vndr) currently doesn't
> support submodules, so we vendor the top-level moby/sys repository (which contains
> both) and pick the most recent tag, which could be either `mountinfo/vXXX` or
> `mount/vXXX`.

github.com/moby/sys/mountinfo v0.4.0
--------------------------------------------------------------------------------

Breaking changes:

- `PidMountInfo` is now deprecated and will be removed before v1.0; users should switch to `GetMountsFromReader`

Fixes and improvements:

- run filter after all fields are parsed
- correct handling errors from bufio.Scan
- documentation formatting fixes

github.com/moby/sys/mountinfo v0.3.1
--------------------------------------------------------------------------------

- mount: use MNT_* flags from golang.org/x/sys/unix on freebsd
- various godoc and CI fixes
- mountinfo: make GetMountinfoFromReader Linux-specific
- Add support for OpenBSD in addition to FreeBSD
- mountinfo: use idiomatic naming for fields

github.com/moby/sys/mountinfo v0.2.0
--------------------------------------------------------------------------------

Bug fixes:

- Fix path unescaping for paths with double quotes

Improvements:

- Mounted: speed up by adding fast paths using openat2 (Linux-only) and stat
- Mounted: relax path requirements (allow relative, non-cleaned paths, symlinks)
- Unescape fstype and source fields
- Documentation improvements

Testing/CI:

- Unit tests: exclude darwin
- CI: run tests under Fedora 32 to test openat2
- TestGetMounts: fix for Ubuntu build system
- Makefile: fix ignoring test failures
- CI: add cross build

github.com/moby/sys/mount v0.1.1
--------------------------------------------------------------------------------

https://github.com/moby/sys/releases/tag/mount%2Fv0.1.1

Improvements:

- RecursiveUnmount: add a fast path (#26)
- Unmount: improve doc
- fix CI linter warning on Windows

Testing/CI:

- Unit tests: exclude darwin
- Makefile: fix ignoring test failures
- CI: add cross build

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-29 23:02:28 +01:00
Arko Dasgupta
1623e6b222 Vendor in Libnetwork changes
Bring in changes from https://github.com/moby/libnetwork/pull/2572 to moby

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2020-10-29 14:32:04 -07:00
Sebastiaan van Stijn
6f0709e033
vendor: golang.org/x/sys eeed37f84f13f52d35e095e8023ba65671ff86a1
aee5d888a8...eeed37f84f

- all: add GOOS=ios
- unix: add back IoctlCtlInfo on darwin
- windows: add SetConsoleCursorPosition
- unix: update Dockerfile to Linux 5.9 and Go 1.15.2 (adds `CAP_CHECKPOINT_RESTORE`)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 23:50:03 +02:00
Sebastiaan van Stijn
4680836f80
vendor: github.com/containerd/console v1.0.1
full diff: https://github.com/containerd/console/compare/v1.0.0...v1.0.1

Fixes compatibility with current versions of golang.org/x/sys

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 23:04:02 +02:00
Sebastiaan van Stijn
80c3199c18
vendor: github.com/spf13/cobra v1.1.1
full diff: https://github.com/spf13/cobra/compare/v1.0.0...v1.1.1

Notable changes:

- Extend Go completions and revamp zsh comp
- Add completion for help command
- Complete subcommands when TraverseChildren is set
- Fix stderr printing functions
- fix: fish output redirection
- fix manpage building with new go-md2man

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 21:25:10 +02:00
Sebastiaan van Stijn
6b538ffbca
vendor: github.com/gofrs/flock v0.7.3
full diff: https://github.com/gofrs/flock/compare/v0.7.1...v0.7.3

Relevant changes:

- fix: close/Unlock won't close the file descriptor if not locked
- fix license text, update year

Note that there's also a v0.8.0 release; that release only adds aix support,
which is currently of no interest to us, so skipping that version for now.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-06 12:12:33 +02:00
Tibor Vass
1a5b7f50bc
Merge pull request #39838 from thaJeztah/bump_gcplogs
Bump gcplogs and dependencies to v0.44.3
2020-10-02 06:30:48 -07:00
Sebastiaan van Stijn
a3256d2dd8 bump google.golang.org/api v0.8.0
full diff: de943baf05...v0.8.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-01 23:47:15 +00:00
Sebastiaan van Stijn
2971204e43 bump go.opencensus.io v0.22.3
full diff: https://github.com/census-instrumentation/opencensus-go/compare/v0.11.0...v0.22.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-01 23:47:15 +00:00
Sebastiaan van Stijn
bbde240ce0 bump cloud.google.com/go v-0.44.3
bump cloud.google.com/go v0.44.3:

full diff: https://github.com/googleapis/google-cloud-go/compare/v0.23.0...v0.44.3

bump googleapis/gax-go v2.0.5

full diff: https://github.com/googleapis/gax-go/compare/v2.0.0...v2.0.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-10-01 23:47:11 +00:00
Sebastiaan van Stijn
c9bbf37f85
vendor: sirupsen/logrus v1.7.0
full diff: https://github.com/sirupsen/logrus/compare/v1.6.0...v1.7.0

removes dependency on github.com/konsorten/go-windows-terminal-sequences

Features:
   * a new buffer pool management API has been added
   * a set of `<LogLevel>Fn()` functions have been added

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-30 13:38:38 +02:00
Sebastiaan van Stijn
77096349e1
vendor: github.com/coreos/pkg v4
full diff: https://github.com/coreos/pkg/compare/v3...v4

- capnslog: fix compatibility with pflag

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-30 01:24:19 +02:00
Brian Goff
2617742802
Merge pull request #41482 from tklauser/unix-fileclone 2020-09-25 17:02:17 -07:00
Tobias Klauser
6267800783 vendor: golang.org/x/sys aee5d888a86055dc6ab0342f9cdc7b53aaeaec62
full diff: 196b9ba873...aee5d888a8

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2020-09-22 21:44:26 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jintao Zhang
c353c7cc71 vendor runc library to v1.0.0-rc92
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-08-14 14:19:01 +08:00
Jintao Zhang
7ab5b00a9c vendor golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-08-14 14:18:24 +08:00
Jintao Zhang
2ee753a28f vendor golang.org/x/net v0.0.0-20200707034311-ab3426394381
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-08-14 14:17:03 +08:00
Jintao Zhang
5eccaaceb5 vendor golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-08-14 14:14:19 +08:00
Jintao Zhang
15d38650ee vendor containerd library to v1.4.0-rc.1
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-08-14 14:11:09 +08:00
Sebastiaan van Stijn
79eef6e78c
Merge pull request #41178 from tao12345666333/update-runc-to-v1.0.0-rc91
vendor runc libraryv1.0.0-rc91-48-g67169a9d
2020-08-04 14:06:25 +02:00
Sebastiaan van Stijn
47b7c888ee
Merge pull request #41284 from akerouanton/service-ulimits
Support ulimits on Swarm services.
2020-07-30 20:08:41 +02:00
Jintao Zhang
9f28837c1d vendor protobuf v1.3.5
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-30 17:22:59 +00:00
Jintao Zhang
c00d4907da vendor prometheus dependency.
github.com/prometheus/client_golang to v1.6.0
github.com/prometheus/client_model to v0.2.0
github.com/prometheus/common to v0.9.1
github.com/prometheus/procfs to v0.0.11

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-30 17:02:57 +00:00
Jintao Zhang
e58a00211d vendor bbolt v1.3.5
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-30 16:39:59 +00:00
Jintao Zhang
9ad35b7e69 vendor runc 67169a9d43456ff0d5ae12b967acb8e366e2f181
v1.0.0-rc91-48-g67169a9d

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-30 16:16:11 +00:00
Jintao Zhang
9424eccfcd vendor containerd 779ef60231a555f7eb9ba82b052d59b69ca2ef10
v1.4.0-beta.1-150-g779ef602

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-30 16:16:11 +00:00
Akihiro Suda
0592aac95c
vendor: update containerd/cgroups
Changes: 44306b6a1d...318312a373

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-30 14:31:17 +09:00
Brian Goff
a072d726c7
Merge pull request #41281 from thaJeztah/bump_continuity
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
2020-07-29 16:48:01 -07:00
Tibor Vass
d2825ab5f9
Merge pull request #41283 from thaJeztah/bump_netns
vendor: vishvananda/netns db3c7e526aae966c4ccfa6c8189b693d6ac5d202
2020-07-29 14:31:03 +02:00
Albin Kerouanton
1fdb1033c4
Bump swarmkit to d6592ddefd8a5319aadff74c558b816b1a0b2590
Includes docker/swarmkit#2967, which adds Ulimits to ContainerSpec.

Signed-off-by: Albin Kerouanton <albin@akerouanton.name>
2020-07-28 23:56:14 +02:00
Sebastiaan van Stijn
818bad6ef2
vendor: vishvananda/netns db3c7e526aae966c4ccfa6c8189b693d6ac5d202
full diff: 0a2b9b5464...db3c7e526a

- Use golang.org/x/sys/unix instead of syscall
- Set O_CLOEXEC when opening a network namespace
    - Fixes "the container‘s netns fds leak, causing the container netns to not
      clean up successfully after the container stops"
- Allows to create and delete named network namespaces

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-28 21:26:13 +02:00
Sebastiaan van Stijn
36b1920e56
vendor: docker/swarmkit 293aa2e66279a930999044cbf6d0e590baac16ff
full diff: 035d564a36...293aa2e662

- Fix bad comment on capability_drop field in protobuf def

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-28 21:16:18 +02:00
Sebastiaan van Stijn
afdf5483c9
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
full diff: 26c1120b8d...efbc4488d8

Relevant changes:

- sysx/xattr: fix and improve
    - fix getxattrAll: change initial buffer size to 128 to prevent unneeded
      iterations and change the logic to get the real size in case we get ERANGE
      rather than doubling the buffer)
    - improve listxattrAll; refactor for readability, prevent calling `listxattr()`
      twice. Handle condition when attributes size is changed in between the two
      calls to listxattr().
- Remove Windows' Readlink fork
    - Drops support for Go 1.12 and under
- Fix sameFile() to recognize empty files as the same
    - fixes "Empty files can diff as "modified" even when they're not"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-28 16:33:16 +02:00
Sebastiaan van Stijn
b36e87af03
Merge pull request #41249 from cpuguy83/swarm_caps
Replace swarm Capabilites API with cap add/drop API
2020-07-28 01:07:49 +02:00
Brian Goff
baa321293f Revendor swarmkit
This picks up the API changes for cap add/drop for services.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-07-22 21:29:24 -07:00
Tonis Tiigi
8774804ca7 vendor: update buildkit to 4d1f260e8
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-07-20 11:34:22 -07:00
Sebastiaan van Stijn
c9c9e0ab90
pkg/parsers: remove uses of mattn/go-shellwords
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-14 14:03:10 +02:00
Tibor Vass
d78b22cdf5
Merge pull request #41189 from thaJeztah/bump_libnetwork
vendor: libnetwork 9e99af28df21367340c95a3863e31808d689c92a
2020-07-13 15:51:39 +02:00
Sebastiaan van Stijn
a90137825c
Merge pull request #41144 from kevpar/revendor-hcsshim
Revendor hcsshim to fix image import bug
2020-07-08 22:20:54 +02:00
Sebastiaan van Stijn
219e7e7ddc
vendor: libnetwork 9e99af28df21367340c95a3863e31808d689c92a
full diff: 2e24aed516...9e99af28df

- docker/libnetwork#2548 Add docker interfaces to firewalld docker zone
    - fixes docker/for-linux#957 DNS Not Resolving under Network [CentOS8]
    - fixes docker/libnetwork#2496 Port Forwarding does not work on RHEL 8 with Firewalld running with FirewallBackend=nftables
- store.getNetworksFromStore() remove unused error return
- docker/libnetwork#2554 Fix 'failed to get network during CreateEndpoint'
    - fixes/addresses docker/for-linux#888 failed to get network during CreateEndpoint
- docker/libnetwork#2558 [master] bridge: disable IPv6 router advertisements
- docker/libnetwork#2563 log error instead if disabling IPv6 router advertisement failed
    - fixes docker/for-linux#1033 Shouldn't be fatal: Unable to disable IPv6 router advertisement: open /proc/sys/net/ipv6/conf/docker0/accept_ra: read-only file system

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-08 16:12:22 +02:00
Kevin Parsons
2865478487 Revendor hcsshim to fix image import bug
This change brings in a single new commit from Microsoft/hcsshim. The
commit fixes an issue when unpacking a Windows container layer which
could result in incorrect directory timestamps.

This manifested most significantly in an impact to startup times of
some Windows container images (such as anything based on servercore).

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-07-06 14:33:39 -07:00
Brian Goff
3b4cfa9723
Merge pull request #41029 from thaJeztah/bump_selinux
vendor: opencontainers/selinux v1.5.2
2020-07-01 11:15:51 -07:00
Sebastiaan van Stijn
07cea2edf0
Merge pull request #41106 from tonistiigi/buildkit-upgrade-fix
builder-next: update to new buildkit and fix upgrade bugs
2020-06-26 10:43:45 +02:00
Sebastiaan van Stijn
3e2965831f
vendor: golang.org/x/text v0.3.3
full diff: https://github.com/golang/text/compare/v0.3.2...v0.3.3

includes a fix for CVE-2020-14040

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-17 12:52:46 +02:00
Tonis Tiigi
9b28939345 vendor: update buildkit to df35e9818
Update to new buildkit and fix upgrade bugs

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-06-15 09:44:41 -07:00
Brian Goff
201bdd1ac3
Merge pull request #40916 from thaJeztah/bump_containerd
vendor: update containerd c80284d4b5291a351bb471bcdabb5c1d95e7a583
2020-06-11 12:07:23 -07:00
Tibor Vass
83199187ef vendor libnetwork to 2e24aed516bd5c836e11378bb457dd612aa868ed
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-05-28 03:28:51 +00:00
Sebastiaan van Stijn
a9569f5243
vendor: opencontainers/selinux v1.5.2
full diff: https://github.com/opencontainers/selinux/compare/v1.5.1...v1.5.2

- Implement FormatMountLabel unconditionally
  Implementing FormatMountLabel on situations built without selinux
  should be possible; the context will be ignored if no SELinux is available.
- Remote potential race condition, where mcs label is freed
  Theorectially if you do not change the MCS Label then we free it and two
  commands later reserve it. If some other process was grabbing MCS Labels
  at the same time, the other process could get the same label.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-26 16:24:43 +02:00
Tibor Vass
c85b2e5c30
Merge pull request #40908 from thaJeztah/bump_runtime_spec
vendor: opencontainers/runtime-spec v1.0.2
2020-05-14 22:20:47 -07:00
Tibor Vass
2cc328ebdd
Merge pull request #40940 from thaJeztah/bump_gorilla_mux
vendor: gorilla/mux v1.7.4
2020-05-14 21:11:47 -07:00
Sebastiaan van Stijn
2f003f7774
Merge pull request #40930 from thaJeztah/bump_cobra
vendor: spf13/cobra v1.0.0, spf13/pflag v1.0.5
2020-05-14 21:28:51 +02:00
Sebastiaan van Stijn
5fd3496e7a
vendor: gorilla/mux v1.7.4
full diff: https://github.com/gorilla/mux/compare/v1.7.3...v1.7.4

v1.7.4 addresses a number of performance improvements, bugs, and documentation
improvements.

- Reduce allocations in (*routeRegexp).getURLQuery
- Fixed golint warnings
- fix headers regexp test case
- Fix the CORSMethodMiddleware bug with subrouters
- Remove/cleanup request context helpers
- Guess the scheme if r.URL.Scheme is unset
- Added capacity to slice creation, when capacity is known
- Modified http status codes, using constants provided by the http package
- bugfix/subrouter custom methodNotAllowed handler returning 404
- Update README (self-host logo)
- Remove TravisCI badge
- Add documentation for using mux to serve a SPA
- Simplify code
- Avoid unnecessary conversion
- Update config.yml (#495) @elithrar

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 18:35:04 +02:00
Sebastiaan van Stijn
64bc9281de
vendor: opencontainers/runtime-spec v1.0.2
full diff: 29686dbc55...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 14:40:29 +02:00
Sebastiaan van Stijn
71411e486d
vendor: update containerd c80284d4b5291a351bb471bcdabb5c1d95e7a583
full diff: 4d242818bf...c80284d4b5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 14:38:20 +02:00
Sebastiaan van Stijn
11feae7e59
vendor: containerd/ttrpc v1.0.1
full diff: 0be804eadb...v1.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 14:34:26 +02:00
Sebastiaan van Stijn
5ed85b0909
vendor: bump containerd/typeurl v1.0.1
full diff: b45ef1f1f7...v1.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 14:32:13 +02:00
Brian Goff
4a1a65a148
Merge pull request #40928 from thaJeztah/bump_term
vendor: moby/term 73f35e472e8f0a3f91347164138ce6bd73b756a9 (and dependencies)
2020-05-08 10:31:34 -07:00
Sebastiaan van Stijn
dc0a400738
vendor: spf13/cobra v1.0.0
full diff: https://github.com/spf13/cobra/compare/v0.0.3...v1.0.0

Notable Changes

- Fish completion (including support for Go custom completion)
- API (urgent): Rename BashCompDirectives to ShellCompDirectives
- Remove/replace SetOutput on Command - deprecated
- Custom completions coded in Go (instead of Bash)
- Partial Revert of 922
- Correct documentation for InOrStdin
- Apply formatting to templates
- Revert change so help is printed on stdout again
- Update md2man to v2.0.0
- update viper to v1.4.0
- Update cmd/root.go example in README.md

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-08 10:44:36 +02:00
Sebastiaan van Stijn
69df2589cd
vendor: spf13/pflag v1.0.5
full diff: https://github.com/spf13/pflag/compare/v1.0.1...v1.0.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-08 10:44:27 +02:00
Akihiro Suda
cdf49f37ee
Merge pull request #40672 from tiborvass/19.03.8-forwardport-to-master
vendor: add local copy of archive/tar
2020-05-08 08:11:03 +09:00
Sebastiaan van Stijn
11a5b1887e
vendor: moby/term 73f35e472e8f0a3f91347164138ce6bd73b756a9
full diff: 063f2cd0b4...73f35e472e

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-07 22:37:41 +02:00
Sebastiaan van Stijn
4ac17adcd3
vendor: golang.org/x/sys 85ca7c5b95cdf1e557abb38a283d1e61a5959c31
full diff: 5c8b2ff675...85ca7c5b95

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-07 22:37:39 +02:00
Brian Goff
47d9489e7c
Merge pull request #40907 from thaJeztah/bump_selinux
vendor: opencontainers/selinux v1.5.1
2020-05-07 11:51:08 -07:00
Brian Goff
9488aa5c1b
Merge pull request #40909 from thaJeztah/bump_hcsshim
vendor: Microsoft/hcsshim v0.8.9
2020-05-07 11:49:37 -07:00
Sebastiaan van Stijn
25fd814652
vendor: golang.org/x/sys 5c8b2ff67527cb88b770f693cebf3799036d8bc0
full diff: d5e6a3e2c0...5c8b2ff675

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-06 14:15:56 +02:00
Sebastiaan van Stijn
08d3774304
vendor: Microsoft/hcsshim v0.8.9
full diff: https://github.com/Microsoft/hcsshim/compare/v0.8.7...v0.8.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-05 20:42:02 +02:00
Sebastiaan van Stijn
a8216806ce
vendor: opencontainers/selinux v1.5.1
full diff: https://github.com/opencontainers/selinux/compare/v1.3.3...v1.5.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-05 20:33:06 +02:00
Sebastiaan van Stijn
e1e544c8c6
vendor: sirupsen/logrus v1.6.0
full diff: https://github.com/sirupsen/logrus/compare/v1.4.2...v1.6.0

- Ability to DisableHTMLEscape when using the JSON formatter
- Support/fixes for go 1.14
- Many many bugfixes
- Add flag to disable quotes in TextFormatter

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-03 01:55:52 +02:00
Brian Goff
fd784ce7c1
Merge pull request #40872 from thaJeztah/update_terminal_sequences
vendor konsorten/go-windows-terminal-sequences v1.0.3
2020-04-30 10:51:25 -07:00
Sebastiaan van Stijn
c3b3aedfa4
Merge pull request #40662 from AkihiroSuda/cgroup2-dockerinfo
cgroup2: implement `docker info`
2020-04-29 22:57:00 +02:00
Sebastiaan van Stijn
8006a9d08c
vendor konsorten/go-windows-terminal-sequences v1.0.3
full diff: https://github.com/konsorten/go-windows-terminal-sequences/compare/v1.0.2...v1.0.3

Fixes a panic when using logrus on Go 1.14

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-29 11:27:11 +02:00
Sebastiaan van Stijn
b2af9e631c
vendor: update moby/ipvs v1.0.1
full diff: https://github.com/moby/ipvs/compare/v1.0.0...v1.0.1

- Fix compatibility issue on older kernels (< 3.18) where the address
  family attribute for destination servers do not exist
- Fix the stats attribute check when parsing destination addresses
- NetlinkSocketsTimeout should be a constant

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-28 16:59:06 +02:00
Brian Goff
4839b27a1f
Merge pull request #40808 from thaJeztah/update_libnetwork
vendor: update libnetwork 1a17fb36132631a95fe6bb055b91e24a516ad81d
2020-04-24 14:03:12 -07:00
Tonis Tiigi
7260adfff9 vendor: add local copy of archive/tar
This version avoids doing name lookups on creating tarball that
should be avoided in to not hit loading glibc shared libraries.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit aa6a9891b0)
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-04-24 11:22:24 -07:00
Sebastiaan van Stijn
41d4112e89
pkg/term: vendor moby/term and make pkg/term an alias
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-21 16:29:19 +02:00
Sebastiaan van Stijn
c3808634e7
vendor: update libnetwork 1a17fb36132631a95fe6bb055b91e24a516ad81d
full diff: ef149a924d...1a17fb3613

- docker/libnetwork#2538 produce an error with invalid address pool
    - addresses docker/docker#40388 dockerd ignores the --default-address-pool option
- docker/libnetwork#2471 DOCKER-USER chain not created when IPTableEnable=false
- docker/libnetwork#2544 Fix NPE due to null value returned by ep.Iface()
    - carries docker/libnetwork#2239 Prevent NPE in addServiceInfoToCluster()
    - addresses docker/docker#37506 Error initializing docker.server while starting daemon by systemd

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-21 13:00:22 +02:00
Brian Goff
130b0bc603
Merge pull request #40823 from thaJeztah/remove_distrib_uuid
daemon: remove distribution/uuid package
2020-04-16 20:59:58 -07:00
Akihiro Suda
f350b53241 cgroup2: implement docker info
ref: https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-04-17 07:20:01 +09:00
Brian Goff
0f2adcceec
Merge pull request #40774 from thaJeztah/update_small_deps
vendor: pkg/errors v0.9.1, mespath/go-jmespath v0.3.0
2020-04-16 11:55:38 -07:00
Sebastiaan van Stijn
7400375526
daemon: remove distribution/uuid package
This appeared to be unused because we no longer generate
a uuid using this package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-16 09:16:38 +02:00
Tonis Tiigi
0cdf6ba9c8 vendor: update buildkit to ae7ff174
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-04-14 08:26:07 -07:00
Sebastiaan van Stijn
dc089c22ce
vendor: pkg/errors v0.9.1
full diff: https://github.com/pkg/errors/compare/v0.8.1...v0.9.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-04 01:54:46 +02:00
Sebastiaan van Stijn
e7183dbfe9
vendor: update go-events to fix alignment for 32bit systems
- relates to moby/buildkit 1111
- relates to moby/buildkit 1079
- relates to docker/buildx 129

full diff: 9461782956...e31b211e4f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-04 01:53:27 +02:00
Sebastiaan van Stijn
bd8490c0de
vendor: jmespath/go-jmespath v0.3.0
This update is just adding some typo-fixes and adding a go.mod, but
pins it to a tagged release;

c2b33e8439...v0.3.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-04 00:59:15 +02:00
Sebastiaan van Stijn
af0415257e
Merge pull request #40694 from kolyshkin/moby-sys-mount-part-II
switch to moby/sys/{mount,mountinfo} part II
2020-04-02 21:52:21 +02:00
Akihiro Suda
3802830989 cgroup2: implement docker stats
The following fields are unsupported:

* BlkioStats: all fields other than IoServiceBytesRecursive
* CPUStats: CPUUsage.PercpuUsage
* MemoryStats: MaxUsage and Failcnt

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-04-02 17:51:34 +09:00
Drew Erny
1dbf34f3aa Bump swarmkit to ebe39a32e3ed4c3a3783a02c11cccf388818694c
Bumps swarmkit vendoring. Includes docker/swarmkit#2938, which fixes
tasks.db growing out of control on worker nodes.

Signed-off-by: Drew Erny <derny@mirantis.com>
2020-03-26 11:04:58 -05:00
Kir Kolyshkin
75f7e435a2 vndr: vendor in github.com/moby/sys
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-03-20 09:46:16 -07:00
Jintao Zhang
ea44be4b8f vendor: bump libnetwork ef149a924dfde2e506ea3cb3f617d7d0fa96b8ee
fix https://github.com/moby/moby/issues/40715

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-03-19 17:15:58 +08:00
Sebastiaan van Stijn
e26e1cc5c1
vendor: vishvananda/netlink v1.1.0
- vishvananda/netlink: https://github.com/vishvananda/netlink/compare/v1.0.0...v1.1.0
- vishvananda/netns: 7109fa855b...0a2b9b5464
- libnetwork: bf2bd42abc...beab24292c
- github.com/moby/ipvs: new dependency (was previously part of libnetwork)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-12 22:57:23 +01:00
Sebastiaan van Stijn
1d08ccd4ff
vendor: update fsnotify v1.4.9
full diff: 1485a34d5d...v1.4.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-12 09:58:09 +01:00
Sebastiaan van Stijn
e1710b42d3
vendor: bump libnetwork bf2bd42abc0a3734f12b5ec724e571434e42c669
full diff: 264bffcb88...bf2bd42abc

relevant changes:

- docker/libnetwork#2407 Macvlan internal network should not change default gateway
    - fixes docker/libnetwork#2406 Internal macvlan network overrides default gateway
- vendor godbus/dbus v5
- Fix InhibitIPv4 nil panic
- Cleanup VFP during overlay network removal
    - fixes VFP leak in windows overlay network deletion

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 00:35:47 +01:00
Akihiro Suda
9a82a9a8ea vendor containerd, BuildKit, protobuf, grpc, and golang.org/x
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-03-03 10:25:20 +09:00
Sebastiaan van Stijn
501f103a0e
Merge pull request #40597 from thaJeztah/bump_selinux
vendor: update opencontainers/selinux v1.3.3
2020-03-02 16:54:47 +01:00
Sebastiaan van Stijn
fa67cff34b
vendor: update opencontainers/selinux v1.3.3
full diff: https://github.com/opencontainers/selinux/compare/v1.3.1...v1.3.3

- go-selinux/SetKeyLabel: fix for RHEL7 kernels
- getSELinuxfs: optimize/simplify using sync.Once
- xattr: use x/sys/unix, simplify
- Use /proc/thread-self if available
- Fix EnforceMode, SetEnforceMode, and SecurityCheckContext

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 19:19:46 +01:00
Sebastiaan van Stijn
21e5decbaa
vendor: update gotest.tools v3.0.2
full diff: https://github.com/gotestyourself/gotest.tools/compare/v3.0.1...v3.0.2

- assert: Fix NilError, error non-nil type
    - fixes: Typed nil errors should not pass "NilError"
    - fixes: "reflect: call of reflect.Value.IsNil on struct Value" for struct error type

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 16:26:18 +01:00
Sam Whited
8c0f6142a8 Update DNS library
This makes sure that we don't become vulnerable to CVE-2018-17419 or
CVE-2019-19794 in the future.

Signed-off-by: Sam Whited <sam@samwhited.com>
2020-02-25 17:05:57 -05:00
Tonis Tiigi
33baa55353 vendor: update buildkit to d75ed2b68
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-02-24 15:38:51 -08:00
Sebastiaan van Stijn
12c7541f1f
vendor: update opencontainers/selinux v1.3.1
full diff: 5215b1806f...v1.3.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-20 14:40:25 +01:00
Sebastiaan van Stijn
9f0b3f5609
bump gotest.tools v3.0.1 for compatibility with Go 1.14
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-11 00:06:42 +01:00
Samuel Karp
44a8e10bfc
awslogs: Update aws-sdk-go to support IMDSv2
AWS recently launched a new version of the EC2 Instance Metadata
Service, which is used to provide credentials to the awslogs driver when
running on Amazon EC2.  This new version of the IMDS adds
defense-in-depth mechanisms against open firewalls, reverse proxies, and
SSRF vulnerabilities and is generally an improvement over the previous
version.  An updated version of the AWS SDK is able to handle the both
the previous version and the new version of the IMDS and functions when
either is enabled.

More information about IMDSv2 is available at the following links:

* https://aws.amazon.com/blogs/security/defense-in-depth-open-firewalls-reverse-proxies-ssrf-vulnerabilities-ec2-instance-metadata-service/
* https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html

Closes https://github.com/moby/moby/issues/40422

Signed-off-by: Samuel Karp <skarp@amazon.com>
2020-02-06 10:56:05 -08:00
Akihiro Suda
46ec8731fb
Merge pull request #40429 from thaJeztah/bump_golang_1.13.7
Update Golang 1.13.7, golang.org/x/crypto (CVE-2020-0601, CVE-2020-7919)
2020-02-03 18:09:20 +01:00
Sebastiaan van Stijn
b606c8e440
vendor: update golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
full diff: 88737f569e...69ecbb4d6d

Includes 69ecbb4d6d
(forward-port of 8b5121be2f),
which fixes CVE-2020-7919:

- Panic in crypto/x509 certificate parsing and golang.org/x/crypto/cryptobyte
  On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1 parsing
  functions of golang.org/x/crypto/cryptobyte can lead to a panic.
  The malformed certificate can be delivered via a crypto/tls connection to a
  client, or to a server that accepts 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.
  Thanks to Project Wycheproof for providing the test cases that led to the
  discovery of this issue. The issue is CVE-2020-7919 and Go issue golang.org/issue/36837.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-29 18:36:06 +01:00
Drew Erny
fb155a1125 Fix leak related to service logs
See the commit message for the new swarmkit commit. That change fixes a
leaking goroutine related to service logs.

Signed-off-by: Drew Erny <derny@mirantis.com>
2020-01-29 10:36:17 -06:00
Akihiro Suda
6d68080907 update runc library to v1.0.0-rc10 (CVE-2019-19921)
Notable changes:
* Fix CVE-2019-19921 (Volume mount race condition with shared mounts): https://github.com/opencontainers/runc/pull/2207
* Fix exec FIFO race: https://github.com/opencontainers/runc/pull/2185
* Basic support for cgroup v2.  Almost feature-complete, but still missing support for systemd mode in rootless.
  See also https://github.com/opencontainers/runc/issues/2209 for the known issues.

Full changes: https://github.com/opencontainers/runc/compare/v1.0.0-rc9...v1.0.0-rc10

Also updates go-selinux: 3a1f366feb...5215b1806f
(See https://github.com/containerd/cri/pull/1383#issuecomment-578227009)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-25 04:06:24 +09:00
Akihiro Suda
f9d136b6c6
Merge pull request #40307 from dperny/swarm-jobs
Add support for swarm jobs
2020-01-20 12:57:05 +09:00
Brian Goff
e5c8eca2ee
Merge pull request #40384 from arkodg/bump-libnetwork-latest
Bump Libnetwork to latest refpoint
2020-01-16 21:03:26 -08:00
Arko Dasgupta
4c407caada Bump libnetwork to latest refpoint
Commits:
feeff4f0 Merge pull request #2380 from liskin/bridge-atomic-hwaddr
fec6476d Merge pull request #2489 from suwang48404/doc
8757597e Added document describing libnetwork traffic flow.
eaea5722 Merge pull request #2445 from kdomanski/ipv6-addr-in-hosts
1680ce71 Merge pull request #2462 from arkodg/fix-key-spi-panic
4420ee92 Fix panic in drivers/overlay/encryption.go
57178323 Merge pull request #2472 from thaJeztah/bump_golang_1.12.12
f741dc9c Update Golang 1.12.12 (CVE-2019-17596)
79c19d09 Merge pull request #2461 from suwang48404/master
94facacc Added API to set ephemeral port allocator range.

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2020-01-16 16:28:23 -08:00
Sebastiaan van Stijn
fa291552d5
vendor: bump prometheus/client_golang v1.3.0
full diff: https://github.com/prometheus/client_golang/compare/v1.1.0...v1.3.0

This requires LK4D$/vndr v0.1.0 or newer for vendoring; also adds a new
dependency: github.com/cespare/xxhash

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-16 21:32:07 +01:00
Sebastiaan van Stijn
34a65cb3ba
vendor: bump prometheus/client_golang v1.1.0
full diff: https://github.com/prometheus/client_golang/compare/v0.9.4...v1.1.0

Using v1.1.0, because version v1.2.0 and up use versioned import paths for the
github.com/cespare/xxhash/v2 dependency (prometheus/client_golang#657), which
causes vendoring with vndr to break due to the v2 in the import-path.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-16 21:32:05 +01:00
Sebastiaan van Stijn
b2db7c8bc9
vendor: bump prometheus/client_golang v0.9.4, docker/go-metrics v0.0.1
bump docker/go-metrics v0.0.1:

full diff: d466d4f6fd...v0.0.1

- docker/go-metrics#16 fix the compilation error against prometheus/client-golang master
- fixes docker/go-metrics#12 No longer builds against Prom master
- docker/go-metrics#18 metrics: address compile error correctly
- fixes docker/go-metrics#12 No longer builds against Prom master
- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

bump prometheus/client_golang v0.9.4:

full diff: c5b7fccd20...v0.9.4

version v0.9.0 is the minimum required version to work with go-metrics v0.0.1,
as it depends on `prometheus.Observer`:

    vendor/github.com/docker/go-metrics/timer.go:39:4: undefined: prometheus.Observer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-16 21:32:04 +01:00
Sebastiaan van Stijn
12a83ac27e
vendor: bump prometheus/procfs v0.0.8
full diff: 7d6f385de8...v0.0.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-16 21:32:02 +01:00
Sebastiaan van Stijn
54dc6f355b
vendor: bump prometheus/common v0.7.0
full diff: 7600349dcf...v0.7.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-16 21:32:00 +01:00
Sebastiaan van Stijn
9c99f8b9b3
vendor: bump prometheus/client_model v0.1.0
full diff: 6f38060186...v0.1.0

- prometheus/client_model#22 add `go_package`, regenerate Go binding file
- prometheus/client_model#31 Support Go Modules
- prometheus/client_model#38 Remove all languages but Go and add a deprecation note

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-16 21:31:58 +01:00
Sebastiaan van Stijn
ab6e9b94d3
Merge pull request #40370 from thaJeztah/bump_dependencies2
vendor: bump google/shlex b3f49c06ffaeef, beorn7/perks v1.0.1
2020-01-16 21:29:35 +01:00
Drew Erny
30d9fe30b1 Add swarm jobs
Adds support for ReplicatedJob and GlobalJob service modes. These modes
allow running service which execute tasks that exit upon success,
instead of daemon-type tasks.

Signed-off-by: Drew Erny <drew.erny@docker.com>
2020-01-13 13:21:12 -06:00
Sebastiaan van Stijn
94a8c8b3c0
vendor: update fsutil 0f039a052ca1da01626278199624b62aed9b3729
full diff: 3bbb99cdbd...0f039a052c

- tonistiigi/fsutil#66 copy: add fast copy path for darwin
- tonistiigi/fsutil#67 Treat Unix sockets as regular files
    - relates to moby/buildkit#1144 Fix socket handling
- tonistiigi/fsutil#68 fix gocrypto commit
- tonistiigi/fsutil#69 receive: use filter on receive diff
    - prevents incremental transfers with userns because the metadata
      on disk is always different than the one being transferred.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-13 14:28:14 +01:00
Sebastiaan van Stijn
67a0695e8b
vendor: update containerd/continuity to 26c1120b8d4107d2471b93ad78ef7ce1fc84c4c4
full diff: f2a389ac0a...26c1120b8d

- containerd/continuity#109 Add OpenBSD support for fs subpackage
- containerd/continuity#141 Add src string to copyDirectory error message
- containerd/continuity#143 fstest: have CreateSocket actually create a socket
- containerd/continuity#144 Support Go Modules
- containerd/continuity#147 xattr lost when copying directory
- containerd/continuity#148 fs: don't convert syscall.Timespec to unix.Timespec directly (doesn't work with gccgo)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-13 14:23:38 +01:00
Sebastiaan van Stijn
5c73cacefc
vendor: bump beorn7/perks v1.0.1
full diff: e7f67b54ab...v1.0.1

add go module support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-13 13:04:56 +01:00
Sebastiaan van Stijn
940a1292db
vendor: bump google/shlex e7afc7fbc51079733e9468cdfd1efcd7d196cd1d
full diff: 6f45313302...e7afc7fbc5

- google/shlex#2 Remove unnecessary UnreadRune call
- google/shlex#3 Add go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-13 13:04:54 +01:00
Drew Erny
07efe6a0a7 Bump swarmkit to 24fb4cfe8af56803640180c5592bf32da732ced2
Bumps the vendoring of github.com/docker/swarmkit to the above commit,
which is the current master at commit time.

Most notably, this includes a change making the ingress network respect
the default address pool. Because of this change, a change to network
integration tests was needed.

Signed-off-by: Drew Erny <drew.erny@docker.com>
2020-01-07 09:43:22 -06:00
Brian Goff
de30f30e90
Merge pull request #40312 from thaJeztah/carry_40276_bump_x_sys
update vendor golang.org/x/sys to 6d18c012aee9febd81bbf9806760c8c4480e870d
2019-12-19 11:34:18 -08:00
Brian Goff
0971ab57f7
Merge pull request #40257 from thaJeztah/bump_go_runc
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
2019-12-19 11:32:38 -08:00
liuxiaodong
ee5aa536d1
update vendor golang.org/x/sys to 6d18c012aee9febd81bbf9806760c8c4480e870d
full diff: c990c680b6...6d18c012ae

    execute "docker run -it {image name} /bin/sh" no response on mip64el platform;
    EpollEvent struct define lack a field named PadFd;
    add the field "PadFd";
    execute docker run -it {image} /bin/sh for test after rebuilded.

Signed-off-by: liuxiaodong <liuxiaodong@loongson.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-12-16 14:07:51 +01:00
Sebastiaan van Stijn
3452f136aa
Merge pull request #40108 from thaJeztah/bump_grpc
bump google.golang.org/grpc v1.23.1
2019-12-13 12:32:51 +01:00
Sebastiaan van Stijn
4afda3bb7c
Merge pull request #40122 from tonistiigi/buildkit-leases2
Update buildkit to containerd leases
2019-11-26 23:35:24 +01:00
Sebastiaan van Stijn
9aa55d97e5
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
full diff: e029b79d8c...a2952bc25f

- containerd/go-runc#56 fix typo in successfully

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-26 15:14:54 +01:00
Vikram bir Singh
a7b6c3f0bf Bump hcsshim to b3f49c06ffaeef24d09c6c08ec8ec8425a
Among other things, this is required to pull in
microsoft/hcsshim#718

Also fixes microsoft/hcsshim#737
which was caught by checks while attempting to bump
up hcsshim version.

Signed-off-by: Vikram bir Singh <vikrambir.singh@docker.com>
2019-11-25 09:58:10 -08:00
Tõnis Tiigi
d1d5f64766
Merge pull request #40021 from thaJeztah/carry_40017
Use newer x/sys/windows SecurityAttributes struct (carry 40017)
2019-11-21 08:57:22 -08:00
Sebastiaan van Stijn
9cf349d0f8
bump libnetwork 90afbb01e1d8acacb505a092744ea42b9f167377
full diff: 0025177e3d...90afbb01e1

includes:

- docker/libnetwork#/2459 Fix Error Check in NewNetwork
- docker/libnetwork#/2466 Revert "Merge pull request #2339 from phyber/iptables-check"
    - reverts docker/libnetwork#/2339 controller: Check if IPTables is enabled for arrangeUserFilterRule
    - re-opens docker/libnetwork#2158 dockerd when run with --iptables=false modifies iptables by adding DOCKER-USER
    - re-opens moby/moby#35777 With iptables=false dockerd still creates DOCKER-USER chain and rules
    - re-opens docker/for-linux#136 dockerd --iptables=false adds DOCKER-USER chain and modify FORWARD chain anyway

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-07 13:43:42 -08:00
Tonis Tiigi
f632e2d8d3 vendor: update containerd to acdcf13d5eaf0dfe0eaeabe7194a82535549bc2b
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-11-05 12:50:38 -08:00
Tonis Tiigi
fb1601d5ab vendor: update buildkit to leases support
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-11-05 10:14:33 -08:00
Sebastiaan van Stijn
27552ceb15
bump containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a
full diff: c4b9ac5c76...5fbad35c2a

- containerd/cgroups#82 Add go module support
- containerd/cgroups#96 Move metrics proto package to stats/v1
- containerd/cgroups#97 Allow overriding the default /proc folder in blkioController
- containerd/cgroups#98 Allows ignoring memory modules
- containerd/cgroups#99 Add Go 1.13 to Travis
- containerd/cgroups#100 stats/v1: export per-cgroup stats

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-31 01:09:12 +01:00
Sebastiaan van Stijn
a5341aaf32
bump Microsoft/hcsshim 2226e083fc390003ae5aa8325c3c92789afa0e7a
Adds osversion.Build() utility

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-22 02:51:21 +02:00
Sebastiaan van Stijn
39ad39d220
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-22 00:00:55 +02:00
Sebastiaan van Stijn
1fab7c6457
bump Graylog2/go-gelf to 1550ee647df0510058c9d67a45c56f18911d80b8
4143646226...1550ee647d

includes

- Graylog2/go-gelf#20 Prevent panic when unmarshalling JSON
- Graylog2/go-gelf#23 Feat: Use more precise time stamps
- Graylog2/go-gelf#31 bugfix. Not goroutine safe for TCP writer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-17 18:41:03 +02:00
Grant Millar
df7b8f458a daemon: Use short libnetwork ID in exec-root & update libnetwork
Signed-off-by: Grant Millar <rid@cylo.io>
2019-10-15 11:40:24 +01:00
Brian Goff
e443512ce4 Use ocischema package instead of custom handler
Previously we were re-using schema2.DeserializedManifest to handle oci
manifests. The issue lies in the fact that distribution started
validating the media type string during json deserialization. This
change broke our usage of that type.

Instead distribution now provides direct support for oci schemas, so use
that instead of our custom handlers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-10-11 10:19:29 -07:00
Tibor Vass
b3be2802d4
Merge pull request #39713 from thaJeztah/containerd_1.3
bump containerd and dependencies to v1.3.0
2019-10-08 10:43:56 -07:00
Sebastiaan van Stijn
bb5650619e
bump gorilla/mux v1.7.3
full diff: ed099d4238...00bdffe0f3

changes included:

- gorilla/mux#477 Improve CORS Method Middleware
    - implements gorilla/mux#477 Make CORSMethodMiddleware actually make sense
- gorilla/mux#489 Fix nil panic in authentication middleware example

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 11:38:53 +02:00
Sebastiaan van Stijn
38418287f7
bump olang/gddo 72a348e765d293ed6d1ded7b699591f14d6cd921
no local code changes, just keeping up with upstream

full diff: 9b12a26f3f...72a348e765

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 11:30:52 +02:00
Sebastiaan van Stijn
e5dce0f8c5
bump creack/pty v1.1.9
full diff: https://github.com/creack/pty/compare/v1.1.7...v1.1.9

adds go mod support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 03:01:05 +02:00
Sebastiaan van Stijn
61a2b7ac94
bump gofrs/flock v0.7.1
full diff: https://github.com/gofrs/flock/compare/v0.7.0...v0.7.1

- gofrs/flock#34 don't mention sync.Locker in package documentation
    - fixes gofrs/flock#33 incorrect interface
- gofrs/flock#35 Fix linting issues and add goreportcard badge

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 02:39:43 +02:00
Sebastiaan van Stijn
9bd1b1a8ec
bump imdario/mergo v0.3.8
full diff: https://github.com/imdario/mergo/compare/v0.3.7...v0.3.8

includes:

- imdario/mergo#112 Add strict override
    - fixes imdario/mergo#111 WithOverride should be able to check types
- imdario/mergo#106 Fix merging of interface types with concrete values
- imdario/mergo#120 should not overwrite pointers directly, instead check embedded values
    - fixes imdario/mergo#114 Embedded struct of pointer types will overwrite the whole destination struct
- imdario/mergo#125 added WithOverrideEmptySlice config flag

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 02:39:24 +02:00
Sebastiaan van Stijn
7dee71e02f
bump mattn/go-shellwords v1.0.6
full diff: https://github.com/mattn/go-shellwords/compare/v1.0.5...v1.0.6

relevant changes:

- mattn/go-shellwords#24 Add dir option for parser
- mattn/go-shellwords#26 Fix backquote in part of argument
    - fixes mattn/go-shellwords#25 Backtick "eats" all runes until isSpace
- mattn/go-shellwords#28 Fix dollar quote
    - fixes mattn/go-shellwords#27 Multi-commands inside of command substitution are throwing "invalid command line string" errors
- mattn/go-shellwords#24 Add dir option for parser
- mattn/go-shellwords#24 Add dir option for parser
- mattn/go-shellwords#24 Add dir option for parser

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 02:19:58 +02:00
Sebastiaan van Stijn
9fac44028e
bump logrus v1.4.2
full diff: https://github.com/sirupsen/logrus/compare/v1.4.1...v1.4.2

- sirupsen/logrus#946 Fix solaris build
- sirupsen/logrus#966 Add a checkTerminal for nacl to support running on play.golang.org
- sirupsen/logrus#969 fix build break for plan9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 02:16:47 +02:00
Sebastiaan van Stijn
82097c0f1f
bump hashicorp/golang-lru v0.5.3
full diff: https://github.com/hashicorp/golang-lru/compare/v0.5.1...v0.5.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-04 15:05:35 -07:00
Derek McGowan
bc5484d2dd
bump moby/buildkit f7042823e340d38d1746aa675b83d1aca431cee3
full diff: 588c73e1e4...f7042823e3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

fix daemon for changes in containerd registry configuration

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

Update buildernext and daemon for buildkit update

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-04 15:05:35 -07:00
Sebastiaan van Stijn
0b5dcdc5d7
bump containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
full diff: a9fb20d874...bda0ff6ed7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-04 15:05:34 -07:00
Sebastiaan van Stijn
0af1099a81
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
full diff:  github.com/containerd/cgroups 4994991857...c4b9ac5c76

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-04 15:05:34 -07:00
Sebastiaan van Stijn
1617be92d3
bump containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
- github.com/containerd/go-runc 7d11b49dc0...e029b79d8c
  - containerd/go-runc#52 Fix Method of judging command execution failure
    - fixes "init.pid: no such file or directory: unknown" errors
  - containerd/go-runc#54 avoid setting NOTIFY_SOCKET from calling process

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-04 15:05:33 -07:00
Derek McGowan
12f9887c8e
bump containerd v1.3.0
full diff: 7c1e88399e...v1.3.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-04 15:05:33 -07:00
Sebastiaan van Stijn
ac51b18339
Re-run vndr to fix master
Pull requests started failing because vendoring didn't match;

```
The result of vndr differs

D vendor/golang.org/x/sync/singleflight/singleflight.go

Please vendor your package with github.com/LK4D4/vndr.
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 22:18:47 +02:00
Sebastiaan van Stijn
4e0836f01b
bump golang.org/x/sys c990c680b611ac1aeb7d8f2af94a825f98d69720
full diff: 9eafafc0a8...c990c680b6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-02 21:12:20 +02:00
Sebastiaan van Stijn
ac0ab114a2
bump runc vendor v1.0.0-rc8-92-g84373aaa
full diff: https://github.com/opencontainers/runc/compare/v1.0.0-rc8...3e425f80a8c931f88e6d94a8c831b9d5aa481657

  - opencontainers/runc#2010 criu image path permission error when checkpoint rootless container
  - opencontainers/runc#2028 Update to Go 1.12 and drop obsolete versions
  - opencontainers/runc#2029 Update dependencies
  - opencontainers/runc#2034 Support for logging from children processes
  - opencontainers/runc#2035 specconv: always set "type: bind" in case of MS_BIND
  - opencontainers/runc#2038 `r.destroy` can defer exec in `runner.run` method
  - opencontainers/runc#2041 Change the permissions of the notify listener socket to rwx for everyone
  - opencontainers/runc#2042 libcontainer: intelrdt: add missing destroy handler in defer func
  - opencontainers/runc#2047 Move systemd.Manager initialization into a function in that module
  - opencontainers/runc#2057 main: not reopen /dev/stderr
      - closes opencontainers/runc#2056 Runc + podman|cri-o + systemd issue with stderr
      - closes kubernetes/kubernetes#77615 kubelet fails starting CRI-O containers (Ubuntu 18.04 + systemd cgroups driver)
      - closes cri-o/cri-o#2368 Joining worker node not starting flannel or kube-proxy / CRI-O error "open /dev/stderr: no such device or address"
  - opencontainers/runc#2061 libcontainer: fix TestGetContainerState to check configs.NEWCGROUP
  - opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - opencontainers/runc#2067 libcontainer: change seccomp test for clone syscall
  - opencontainers/runc#2074 Update dependency libseccomp-golang
  - opencontainers/runc#2081 Bump CRIU to 3.12
  - opencontainers/runc#2089 doc: First process in container needs `Init: true`
  - opencontainers/runc#2094 Skip searching /dev/.udev for device nodes
      - closes opencontainers/runc#2093 HostDevices() race with older udevd versions
  - opencontainers/runc#2098 man: fix man-pages
  - opencontainers/runc#2103 cgroups/fs: check nil pointers in cgroup manager
  - opencontainers/runc#2107 Make get devices function public
  - opencontainers/runc#2113 libcontainer: initial support for cgroups v2
  - opencontainers/runc#2116 Avoid the dependency on cgo through go-systemd/util package
      - removes github.com/coreos/pkg as dependency
  - opencontainers/runc#2117 Remove libcontainer detection for systemd features
      - fixes opencontainers/runc#2117 Cache the systemd detection results
  - opencontainers/runc#2119 libcontainer: update masked paths of /proc
      - relates to moby/moby#36368 Add /proc/keys to masked paths
      - relates to moby/moby#38299 Masked /proc/asound
      - relates to moby/moby#37404 Add /proc/acpi to masked paths (CVE-2018-10892)
  - opencontainers/runc#2122 nsenter: minor fixes
  - opencontainers/runc#2123 Bump x/sys and update syscall for initial Risc-V support
  - opencontainers/runc#2125 cgroup: support mount of cgroup2
  - opencontainers/runc#2126 libcontainer/nsenter: Don't import C in non-cgo file
  - opencontainers/runc#2129 Only allow proc mount if it is procfs
      - addresses opencontainers/runc#2129 AppArmor can be bypassed by a malicious image that specifies a volume at /proc (CVE-2019-16884)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-27 16:22:37 +02:00
Sebastiaan van Stijn
75477f0b3c
bump libnetwork to 96bcc0dae898308ed659c5095526788a602f4726
full diff: 92d1fbe1eb...96bcc0dae8

changes included:

- docker/libnetwork#2429 Updating IPAM config with results from HNS create network call
  - addresses moby/moby#38358
- docker/libnetwork#2450 Always configure iptables forward policy
  - related to moby/moby#14041 and docker/libnetwork#1526

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-20 19:48:49 +02:00
Tibor Vass
3aa4ff64aa vendor: remove vdemeester/shakers and go-check/check
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-09-09 21:09:57 +00:00
Sebastiaan van Stijn
f505abb6a7
Merge pull request #39855 from thaJeztah/bump_libnetwork
bump libnetwork and dependencies to 92d1fbe1eb0883cf11d283cea8e658275146411d
2019-09-03 18:12:08 +02:00
Sebastiaan van Stijn
492945c2d5
bump hashicorp/go-sockaddr v1.0.2
full diff: 6d291a969b...v1.0.2

Relevant changes:
  - hashicorp/go-sockaddr#25 Add android os
  - hashicorp/go-sockaddr#28 Add go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-03 11:54:32 +02:00
Sebastiaan van Stijn
720b66ee1f
bump hashicorp/go-multierror v1.0.0, add errwrap v1.0.0
full diff: fcdddc395d...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-03 11:52:45 +02:00
Sebastiaan van Stijn
bab58c1924
bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
full diff: 09cdcc8c0e...92d1fbe1eb

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- docker/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes docker/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - https://github.com/docker/libnetwork/issues/2289
  - this was a regression introduced in docker/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- docker/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-03 11:49:06 +02:00
Sebastiaan van Stijn
8769255d1b
bump containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
full diff: 699c4e40d1...92c8520ef9

changes:

- containerd/ttrpc#37 Handle EOF to prevent file descriptor leak
- containerd/ttrpc#38 Improve connection error handling
- containerd/ttrpc#40 Support headers
- containerd/ttrpc#41 Add client and server unary interceptors
- containerd/ttrpc#43 metadata as KeyValue type
- containerd/ttrpc#42 Refactor close handling for ttrpc clients
- containerd/ttrpc#44 Fix method full name generation
- containerd/ttrpc#46 Client.Call(): do not return error if no Status is set (gRPC v1.23 and up)
- containerd/ttrpc#49 Handle ok status

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-29 00:16:46 +02:00
Sebastiaan van Stijn
f1cd79976a
bump google.golang.org/grpc v1.23.0
full diff: https://github.com/grpc/grpc-go/compare/v1.20.1...v1.23.0

This update contains security fixes:

- transport: block reading frames when too many transport control frames are queued (grpc/grpc-go#2970)
  - Addresses CVE-2019-9512 (Ping Flood), CVE-2019-9514 (Reset Flood), and CVE-2019-9515 (Settings Flood).

Other changes can be found in the release notes:
https://github.com/grpc/grpc-go/releases/tag/v1.23.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-29 00:13:39 +02:00
Tonis Tiigi
52ed97c5c1 vendor: update buildkit to 588c73e1e4
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-21 16:21:19 -07:00
Tõnis Tiigi
0537236e5a
Merge pull request #39726 from carlosedp/riscv64
bump x/sys to fix riscv64 epoll
2019-08-21 13:14:19 -07:00
CarlosEDP
bc8118b31f bump x/sys to fix riscv64 epoll
Signed-off-by: Carlos de Paula <me@carlosedp.com>
2019-08-19 17:58:48 -03:00
Tonis Tiigi
e59b26087f vendor: update buildkit to v0.6.1
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-14 18:55:30 -07:00
Sebastiaan van Stijn
097c09eb60
Merge pull request #39679 from jterry75/revendor_go-winio
Update Microsoft/go-winio v0.4.14
2019-08-08 15:07:29 +02:00
Justin Terry (VM)
35fe16b7eb Update Microsoft/go-winio v0.4.14
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-08-07 09:36:51 -07:00
Tonis Tiigi
c60e53a274 vendor: update buildkit to f5a55a95
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-08-06 20:44:32 -07:00
Sebastiaan van Stijn
6f234db9fe
bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
full diff: 83d30db536...09cdcc8c0e

changes included:

- docker/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- docker/libnetwork#2411 Macvlan network handles netlabel.Internal wrong
  - fixes docker/libnetwork#2410 Macvlan network handles netlabel.Internal wrong
- docker/libnetwork#2414 Allow network with --config-from to be --internal
  - fixes docker/libnetwork#2413 Network with --config-from does not honor --internal
- docker/libnetwork#2351 Use fewer modprobes
  - relates to moby/moby#38930 Use fewer modprobes
- docker/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks
  - carry of docker/libnetwork#2295 phantom ip/mac vlan network after a powercycle
  - fixes docker/libnetwork#1743 Phantom docker network

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-30 10:37:48 -07:00
Sebastiaan van Stijn
0595c01718
switch kr/pty to creack/pty v1.1.7
kr/pty was moved to creak/pty and the old location was
archived.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-29 16:59:08 -07:00
Tonis Tiigi
096a7afd37 vendor: update swarmkit to 7dded76ec
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-07-17 11:52:58 -07:00
Tibor Vass
a1cdd4bfcc build: buildkit now honors daemon's DNS config
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-07-10 00:26:03 +00:00
CarlosEDP
9eaab0425b Update modules to support riscv64
Signed-off-by: CarlosEDP <me@carlosedp.com>
2019-06-29 18:45:42 +00:00
Tibor Vass
e105a74c54
Merge pull request #39216 from thaJeztah/bump_vndr
bump vndr to f5ab8fc5f, and revendor
2019-06-29 10:39:37 -07:00
Tibor Vass
14bd416d0e vendor: containerd to 7c1e88399
Fixes https://github.com/moby/buildkit/issues/1062
when DOCKER_BUILDKIT=1

Signed-off-by: Tibor Vass <tibor@docker.com>
2019-06-28 18:28:09 +00:00
Sebastiaan van Stijn
0a3c9b935c bump vndr to f5ab8fc5f, and revendor
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-28 18:13:17 +00:00
Michael Crosby
70f67c6240
Merge pull request #39409 from thaJeztah/bump_libseccomp
bump libseccomp-golang v0.9.1
2019-06-28 09:58:06 -04:00
Tibor Vass
9e6f83bee1
Merge pull request #39054 from thaJeztah/bump_libnetwork2
bump libnetwork. vishvananda/netlink 1.0, vishvananda/netns
2019-06-27 10:34:01 -07:00
Sebastiaan van Stijn
344b093258
bump libnetwork. vishvananda/netlink 1.0, vishvananda/netns
full diffs:

- fc5a7d91d5...62a13ae87c
- b2de5d10e3...v1.0.0
- 604eaf189e...13995c7128ccc8e51e9a6bd2b551020a27180abd

notable changes in libnetwork:

- docker/libnetwork#2366 Bump vishvananda/netlink to 1.0.0
- docker/libnetwork#2339 controller: Check if IPTables is enabled for arrangeUserFilterRule
  - addresses docker/libnetwork#2158 dockerd when run with --iptables=false modifies iptables by adding DOCKER-USER
  - addresses moby/moby#35777 With iptables=false dockerd still creates DOCKER-USER chain and rules
  - addresses docker/for-linux#136 dockerd --iptables=false adds DOCKER-USER chain and modify FORWARD chain anyway
- docker/libnetwork#2394 Make DNS records and queries case-insensitive
  - addresses moby/moby#28689 Embedded DNS is case-sensitive
  - addresses moby/moby#21169 hostnames with new networking are case-sensitive

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-25 14:10:15 +02:00
Sebastiaan van Stijn
e01bf76964
bump libseccomp-golang v0.9.1
full diff: 32f571b700...689e3c1541

Release notes:

* Version 0.9.1 - May 21, 2019
- Minimum supported version of libseccomp bumped to v2.2.0
- Use Libseccomp's `seccomp_version` API to retrieve library version
- Unconditionally set TSync attribute for filters, due to Go's heavily threaded nature
- Fix CVE-2017-18367 - Multiple syscall arguments were incorrectly combined with logical-OR, instead of logical-AND
- Fix a failure to build on Debian-based distributions due to CGo code
- Fix unit test failures on 32-bit architectures
- Improve several errors to be more verbose about their causes
- Add support for SCMP_ACT_LOG (with libseccomp versions 2.4.x and higher), permitting syscalls but logging their execution
- Add support for SCMP_FLTATR_CTL_LOG (with libseccomp versions 2.4.x and higher), logging not-allowed actions when they are denied

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-25 10:11:02 +02:00
Sebastiaan van Stijn
25b451e01b
bump gorilla/mux v1.7.2
full diff: https://github.com/gorilla/mux/compare/v1.7.0...v1.7.2

includes:

 - gorilla/mux#457 adding Router.Name to create new Route
 - gorilla/mux#447 host:port matching does not require a :port to be specified

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-20 13:33:46 +02:00
Tonis Tiigi
5c484890e0 vendor: update buildkit to c2427506
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-10 21:49:22 -07:00