Commit graph

732 commits

Author SHA1 Message Date
Sebastiaan van Stijn
4b8f129fc7
bump beorn7/perks e7f67b54abbeac9c40a31de0f81159e4cafebd6a
no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:30 +02:00
Sebastiaan van Stijn
9234218c50
bump containerd/fifo a9fb20d87448d386e6d50b1f2e1fa70dcf0de43c
- containerd/fifo#17 Expose underlying file's `SyscallConn` method

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:27 +02:00
Sebastiaan van Stijn
f18971fc5d
bump containerd/go-runc 7d11b49dc0769f6dbb0d1b19f3d48524d1bad9ad
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:24 +02:00
Sebastiaan van Stijn
c69f7f27c5
bump containerd/typeurl 2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:22 +02:00
Sebastiaan van Stijn
179d51ba98
bump mistifyio/go-zfs d5b163290a48f624cbf244ebe4e89ce38653064c
full diff: 22c9b32c84...f784269be4

relevant changes:

- mistifyio/go-zfs#50 Fix GetProperty always returning 'VALUE'
  - fixes mistifyio/go-zfs#49 dataset.GetProperty(key) always returns 'VALUE'
- mistifyio/go-zfs#53 Fix parseLine for fragmentation field
  - fixes mistifyio/go-zfs#52 setUint receives empty string for fragmentation in some cases
- mistifyio/go-zfs#54 Add 'referenced' to zfs properties
- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:19 +02:00
Sebastiaan van Stijn
da1fbb3f2b
bump syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
full diff: 2c00daeb6c...d98352740c

relevant changes:

- syndtr/gocapability#11 Add support for ambient capabilities
- syndtr/gocapability#13 Fix issue #12: break too early
- syndtr/gocapability#16 Fix capHeader.pid type

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:16 +02:00
Sebastiaan van Stijn
8fa04b3a06
bump hashicorp/golang-lru v0.5.1
0fb14efe8c...7087cb70de

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 23:55:12 +02:00
Sebastiaan van Stijn
1bcbdc6085
vendor.conf: reserve space for downstream projects
This helps merge conflicts in situations where downstream
projects have additional dependencies.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-14 16:18:50 +02:00
Sebastiaan van Stijn
99e930f93f
Reformat vendor.conf and pin all deps by git-sha
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-11 02:28:07 +02:00
Sebastiaan van Stijn
c2cb72e085
Merge pull request #39012 from thaJeztah/bump_dependencies
Bump various dependencies
2019-04-10 11:10:32 +02:00
Sebastiaan van Stijn
6251d81510
bump tchap/go-patricia v2.3.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:56 +02:00
Sebastiaan van Stijn
b00897d51a
bump philhofer/fwd v1.0.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:53 +02:00
Sebastiaan van Stijn
d72d3adf1c
bump RackSec/srslog a4725f04ec91af1a91b380da679d6e0c2f061e59
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:50 +02:00
Sebastiaan van Stijn
dfa863db45
bump golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c
removes use of golang.org/x/net/context

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:47 +02:00
Sebastiaan van Stijn
1e2eea5ce8
bump konsorten/go-windows-terminal-sequences v1.0.2
Add Linux build support;
Increase compatibility as the module will appear empty and cause an error on Linux.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:44 +02:00
Sebastiaan van Stijn
8b3759eae1
bump mattn/go-shellwords v1.0.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:41 +02:00
Sebastiaan van Stijn
059e2ca135
bump imdario/mergo v0.3.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:39 +02:00
Sebastiaan van Stijn
f5b8046335
bump github.com/kr/pty v1.1.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:36 +02:00
Sebastiaan van Stijn
f86cac5713
bump gotest.tools v2.3.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:16:33 +02:00
Sebastiaan van Stijn
5f56666036
bump golang.org/x/crypto, golang.org/x/sys
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:12:43 +02:00
Sebastiaan van Stijn
054e39c0f9
bump golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146
drops support for Go 1.8 and older

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-10 00:12:38 +02:00
Sebastiaan van Stijn
ed68d3ab72
Merge pull request #39018 from mavenugo/moby-libn-vndr
Vendor Libnetwork 48f8463
2019-04-09 21:46:34 +02:00
Brian Goff
e2458561f9
Merge pull request #39001 from thaJeztah/reduce_checkers
Remove some checkers and use gotest.tools
2019-04-09 10:54:36 -07:00
Akihiro Suda
9d850cbfa5
Merge pull request #39016 from tao12345666333/bump-containerd-v1.2.6
Bump containerd v1.2.6, runc 029124da7af7360afa781a0234d1b083550f797c
2019-04-09 16:59:15 +09:00
Madhu Venugopal
9894f3f596 Vendor Libnetwork 48f8463
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2019-04-07 13:06:53 -07:00
Jintao Zhang
c28171c7c4 Vendor runc 029124da7af7360afa781a0234d1b083550f797c
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2019-04-06 18:02:52 +00:00
Sebastiaan van Stijn
6f572c8154
bump google.golang.org/grpc v1.12.2
full diff: https://github.com/grpc/grpc-go/compare/v1.12.0...v1.12.2

- grpc/grpc-go#2074 transport/server: fix race between writing status and header
  - fix grpc/grpc-go#1972 Possible race sending headers from server while receiving message over size limit
- grpc/grpc-go#2074 transport: account for user configured small io write buffer
  - fix grpc/grpc-go#2089 Server abruptly terminates connections if write buffer is small enough

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-06 13:00:10 +02:00
Sebastiaan van Stijn
86f2ac4a6b
Remove some checkers to discourage usage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 15:22:10 +02:00
Akihiro Suda
dbe4a30928
Merge pull request #38997 from thaJeztah/bump_selinux
bump opencontainers/selinux v1.2.1
2019-04-04 16:59:23 +09:00
Sebastiaan van Stijn
a38d8b0730
bump sirupsen/logrus v1.4.1
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1

Fixes:

- Remove dependency on golang.org/x/crypto
- Fix wrong method calls Logger.Print and Logger.Warningln
- Update Entry.Logf to not do string formatting unless the log level is enabled
- Fix infinite recursion on unknown Level.String()
- Fix race condition in getCaller
- Fix Entry.WithContext method to return a copy of the initial entry

New:

- Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer)
- Add CallerPrettyfier to JSONFormatter and `TextFormatter`
- Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks
- Enhance TextFormatter to not print caller information when they are empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 21:52:58 +02:00
Sebastiaan van Stijn
606ac478ad
bump opencontainers/selinux v1.2.1
full diff: https://github.com/opencontainers/selinux/compare/v1.2...v1.2.1

brings in opencontainers/selinux#49 Ignore attempts to setLabels "" on SELinux disabled systems

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 21:45:22 +02:00
Tõnis Tiigi
bcaa613d82
Merge pull request #38983 from thaJeztah/bump_libnetwork
bump libnetwork to ebcade70ad1059b070d0040d798ecca359bc5fed
2019-04-03 10:26:47 -07:00
Tonis Tiigi
b6aae9919f vendor: update buildkit to b3028967a
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-04-03 01:01:01 -07:00
Tibor Vass
32157f9b12
Merge pull request #38959 from Microsoft/jjh/bumphcsshim
Vendor Microsoft/hcsshim@ba3d6667
2019-04-01 11:29:46 -07:00
Sebastiaan van Stijn
3ab093d567
bump libnetwork to ebcade70ad1059b070d0040d798ecca359bc5fed
full diff: 1a06131fb8...ebcade70ad

relevant changes:

- docker/libnetwork#2349 IPVS: Add support for GetConfig/SetConfig
- docker/libnetwork#2343 Revert "debian has iptables-legacy and iptables-nft now"
- docker/libnetwork#2230 Moving IPVLAN driver out of experimental
- docker/libnetwork#2307 Fix for problem where agent is stopped and does not restart
- docker/libnetwork#2303 Touch-up error-message and godoc for ConfigVXLANUDPPort
- docker/libnetwork#2325 Fix possible nil pointer exception
- docker/libnetwork#2302 Use sync.RWMutex for VXLANUDPPort
- docker/libnetwork#2306 Improve error if auto-selecting IP-range failed

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-01 19:40:09 +02:00
Brian Goff
3f08ab936f
Merge pull request #38965 from thaJeztah/bump_cgroups
update containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
2019-03-28 22:26:34 -07:00
Brian Goff
ab47e16cc5
Merge pull request #38918 from thaJeztah/bump_selinux
bump opencontainers/selinux to v1.2
2019-03-28 17:27:03 -07:00
Sebastiaan van Stijn
7392abda03
update containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
full diff: dbea6f2bd4...4994991857

brings in https://github.com/containerd/cgroups/pull/79 Return ErrCgroupDeleted when no subsystems
relates to https://github.com/containerd/containerd/issues/3133 Custom cgroup path does not work in containerd 1.2.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-29 00:00:06 +01:00
John Howard
b2488120ff Vendor Microsoft/hcsshim@ba3d6667
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-27 14:12:40 -07:00
Sebastiaan van Stijn
a356c4eaee
bump swarmkit 18e7e58ea1a5ec016625a636d0d52500eea123bc
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-26 14:57:19 +01:00
Sebastiaan van Stijn
e4cc3adf81
Merge pull request #38922 from Microsoft/jjh/grantvmgroupaccess
LCOW: Add VMGroup SID to layer.vhd; fix layer folder perm
2019-03-23 12:02:19 +01:00
John Howard
36d8e29140 Vendor Microsoft/go-winio@c599b533
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-21 13:12:17 -07:00
Justin Cormack
b3251001c6
Update golang.org/x/crypto
Fixes issues with salsa which is used in swarmkit, see
https://github.com/docker/swarmkit/pull/2838

As we only encrypt small values this should be a non breaking change.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2019-03-21 16:48:45 +00:00
Sebastiaan van Stijn
f43826c433
bump opencontainers/selinux to v1.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-21 10:10:05 +01:00
Tonis Tiigi
e96d1c3754 vendor: update buildkit to e9aca5be
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-03-20 22:01:23 -07:00
John Howard
a3eda72f71
Merge pull request #38541 from Microsoft/jjh/containerd
Windows: Experimental: ContainerD runtime
2019-03-19 21:09:19 -07:00
Tonis Tiigi
4337e97f25 vendor: update containerd to a15b6e2097
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-03-15 00:33:46 -07:00
Tonis Tiigi
586c964af2 vendor: update protobuf for new code compatibility
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-03-15 00:04:15 -07:00
Tonis Tiigi
5166013119 vendor: update buildkit and fsutil
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-03-15 00:04:15 -07:00
Brian Goff
05e7d000f2
Merge pull request #38873 from thaJeztah/update_containerd_1.2.5
Update containerd v1.2.5, runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30
2019-03-14 19:12:41 -07:00
Sebastiaan van Stijn
386b06eacd
vendor containerd/cgroups dbea6f2bd41658b84b00417ceefa416b979cbf10
Relevant changes:

- containerd/containerd#51 Fix empty device type
- containerd/containerd#52 Remove call to unitName
  - Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
  - addresses containerd/containerd#47 cgroups: cgroup deleted
- containerd/containerd#53 systemd-239+ no longer allows delegate slice
- containerd/containerd#54 Bugfix: can't write to cpuset cgroup
- containerd/containerd#63 Makes Load function more lenient on subsystems' checking
  - addresses containerd/containerd#58 Very strict checking of subsystems' existence while loading cgroup
- containerd/containerd#67 Add functionality for retrieving all tasks of a cgroup
- containerd/containerd#68 Fix net_prio typo
- containerd/containerd#69 Blkio weight/leafWeight pointer value
- containerd/containerd#77 Check for non-active/supported cgroups
  - addresses containerd/containerd#76 unable to find * in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown
  - addresses docker/for-linux#552 Error response from daemon: unable to find "cpuacct" in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-13 21:39:49 +01:00
Sebastiaan van Stijn
69f7263795
vendor containerd client v1.2.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-13 21:22:13 +01:00
Sebastiaan van Stijn
79f5fbee01
Vendor runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-13 21:15:32 +01:00
Justin Cormack
c435551ccc
Switch to google/uuid
pborman/uuid and google/uuid used to be different versions of
the same package, but now pborman/uuid is a compatibility wrapper
around google/uuid, maintained by the same person.

Clean up some of the usage as the functions differ slightly.

Not yet removed some uses of pborman/uuid in vendored code but
I have PRs in process for these.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2019-03-13 14:13:58 +00:00
John Howard
1feaf88aa0 Vendor sirupsen/logrus@v1.3.0
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-12 18:41:55 -07:00
John Howard
d1cb9a47ec Vendor Microsoft/opengcs@a1096715
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-12 18:41:55 -07:00
John Howard
25dff4b4ab Vendor Microsoft/go-winio@4de24ed3
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-12 18:41:46 -07:00
John Howard
cc46695320 Vendor Microsoft/hcsshim@ada9cb39
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-12 18:21:41 -07:00
Sebastiaan van Stijn
667e800b2c
bump swarmkit to 415dc72789e2b733ea884f09188c286ca187d8ec
relevant changes:

- swarmkit#2815 Extension and resource API declarations
- swarmkit#2816 Moving swap options into `ResourceRequirements` instead of `ContainerSpec`s
  - relates to moby#37872
- swarmkit#2821 allocator: use a map for network-IDs to prevent O(n2)
- swarmkit#2832 [api] Add created object to return types for extension and resource create apis
- swarmkit#2831 [controlapi] Extension api implementation
- swarmkit#2835 Resource controlapi Implemetation
- swarmkit#2802 Use custom gRPC dialer to override default proxy dialer
  - addresses moby#35395 Swarm worker cannot connect to master if proxy is configured
  - addresses moby#issues/36951 Swarm nodes cannot join as masters if http proxy is set
  - relates to swarmkit#2419 Provide custom gRPC dialer to override default proxy dialer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-06 16:46:01 +01:00
Sebastiaan van Stijn
defb2b57a7
Update containerd client to 1.2.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-14 04:47:27 +01:00
Sebastiaan van Stijn
c4763e02d1
Update containerd to 1.2.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-12 14:39:27 +01:00
Akihiro Suda
f18cf23e97
Merge pull request #38692 from Microsoft/jjh/runtime-spec
Vendor opencontainers/runtime-spec 29686dbc
2019-02-11 15:24:42 +09:00
Sebastiaan van Stijn
477eeef60c
Bump gorilla/mux to 1.7.0
This release drops support for Go < 1.7, and removes the gorilla/context
dependency (which was needed for older Go versions).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-09 16:23:55 +01:00
John Howard
9f1b2b7031 Vendor opencontainers/runtime-spec 29686dbc
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-07 18:46:38 -08:00
John Howard
07742515fb Vendor Microsoft/hcsshim @ v0.8.6
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-05 09:52:31 -08:00
Sebastiaan van Stijn
b462bba1b0
Bump SwarmKit to fix proto capitalization
This brings in a single fix; swarmkit#2813 where a field inadvertedly
used incorrect capitalization.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-01 22:22:37 +01:00
Sebastiaan van Stijn
0e60e48134
Bump swarmkit to 1a0ebd43b2d156983a695f90e56f4ecba6ced902
Full diff: 8af8c420f4...1a0ebd43b2

relevant changes:

- swarmkit#2771 Allow using Configs as CredentialSpecs
- swarmkit#2804 Make Service.UpdateStatus non-ambiguous
- swarmkit#2805 Refactor condition in restart supervisor
- swarmkit#2780 api: add BindOptions.NonRecursive
  - related to moby#38003
- swarmkit#2790 Fix possible panic if NetworkConfig is nil
- swarmkit#2797 Include old error-message for backward compatibility
  - related to swarmkit#2779 / moby#38140 / moby#38142

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-01 01:35:12 +01:00
Yong Tang
0cde75e2ea
Merge pull request #38398 from RaviTezu/replace_gotty_with_aec
replace gotty with aec, since gotty hasn't been updated since very lo…
2019-01-26 16:45:15 -08:00
RaviTeja Pothana
1990a3e409 replace gotty with aec, since gotty hasn't been updated since very long time and aec can drop in for gotty
Signed-off-by: RaviTeja Pothana <ravi-teja@live.com>
2019-01-16 22:10:39 +05:30
Natasha Jarus
d104a750f9 Update buildkit version -- improved parse errors
See https://github.com/moby/buildkit/pull/771

Signed-off-by: Natasha Jarus <linuxmercedes@gmail.com>
2019-01-14 20:01:00 -06:00
Sebastiaan van Stijn
27cc170d28
Bump containerd to v1.2.2
- Fix a bug that a container can't be stopped or inspected when its corresponding image is deleted
- Fix a bug that the cri plugin handles containerd events outside of k8s.io namespace

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-08 02:42:28 +01:00
Michael Crosby
e5d9d72162 Update containerd to aa5e000c963756778ab3ebd1a12c6
This includes a patch on top of containerd 1.2.1 to handle fifo
timeouts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-14 15:41:41 -05:00
Dimitris Mandalidis
d0192ae154 Ignore xattr ENOTSUP errors on copy (fixes #38155)
Signed-off-by: Dimitris Mandalidis <dimitris.mandalidis@gmail.com>
2018-12-11 06:36:51 +02:00
Tibor Vass
6e3113f700
Merge pull request #38327 from andrewhsu/ctrd
update containerd to v1.2.1
2018-12-10 17:28:50 +01:00
Tonis Tiigi
32f4805815 vendor: update buildkit to d9f75920
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-12-10 11:58:16 +00:00
Andrew Hsu
75c4b74155
vndr libnetwork to adjust for updated runc
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-07 18:43:43 +01:00
Andrew Hsu
615eecf8ac
update containerd to v1.2.1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-07 18:28:06 +01:00
John Howard
05151dcc39 Windows:Bump HCSShim to v0.8.3
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-12-03 14:08:26 -08:00
Brian Goff
d5916f6393 Update gorilla/mux
This fixes an issue with mux usage of context for storing vars.
Also the old version is 2 years old.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-11-27 17:06:20 -08:00
Vincent Demeester
6fa149805c
Merge pull request #37638 from jterry75/devices_windows
Add --device support for Windows
2018-11-27 15:03:17 +01:00
Sebastiaan van Stijn
0b7cb16dde
Merge pull request #38102 from selansen/master
VXLAN UDP Port configuration support
2018-11-24 11:50:10 +01:00
selansen
a7ce3140f5 Vendor commit for VXLAN UDP Port configuration support
This commit brings Swarmkit and Libnetwork library changes
Signed-off-by: selansen <elango.siva@docker.com>
2018-11-22 12:44:44 -05:00
Akihiro Suda
74baf62f4b
Merge pull request #38245 from thaJeztah/bump_containerd_v1.2.1
Update containerd to v1.2.1-rc.0
2018-11-22 14:40:13 +09:00
Sebastiaan van Stijn
c58cd154f5
Merge pull request #38231 from adshmh/bump-swarmkit-tmpfs-exec-option
bump swarmkit to bc032e24784ea618044ee438fedec3458abb2ef9
2018-11-22 00:56:35 +01:00
Justin Terry (VM)
b2d99865ea Add --device support for Windows
Implements the --device forwarding for Windows daemons. This maps the physical
device into the container at runtime.

Ex:

docker run --device="class/<clsid>" <image> <cmd>

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-21 15:31:17 -08:00
Sebastiaan van Stijn
2fb5de68a9
Update containerd to v1.2.1-rc.0
The previous update used a commit from master. Now that
all the fixes are backported to the containerd 1.2 release
branch, we can switch back to that branch.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-21 21:14:42 +01:00
Tonis Tiigi
6204eb0645 vendor: update buildkit to v0.3.3
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-11-21 11:02:56 -08:00
Arash Deshmeh
bce98f9a3e bump swarmkit to bc032e24784ea618044ee438fedec3458abb2ef9 to vendor exec option for tmpfs
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-11-20 11:49:38 -05:00
Michael Crosby
d13528c635 wip: bump containerd and runc version
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-11-19 09:49:56 -05:00
Akihiro Suda
287144db42
Merge pull request #38213 from thaJeztah/add_note_about_runc_vendoring
Add a note about updating runc / runc vendoring
2018-11-19 21:29:13 +09:00
Sebastiaan van Stijn
826da28efa
Bump golang.org/x/sys to 90868a75fefd03942536221d7c0e2f84ec62a668
updates golang.org/x/sys to 90868a75fefd03942536221d7c0e2f84ec62a668, which
adds support for building on windows/arm.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-17 01:02:13 +01:00
Sebastiaan van Stijn
da3810d235
Add a note about updating runc / runc vendoring
Containerd should be "leading" when specifying which version of runc to use.
From the RUNC.MD document in the containerd repository
(https://github.com/containerd/containerd/blob/b1e202c32724e82779544365528a1a082
b335553/RUNC.md);

> We depend on a specific runc version when dealing with advanced features. You
> should have a specific runc build for development. The current supported runc
> commit is described in vendor.conf. Please refer to the line that starts with
> github.com/opencontainers/runc.

This patch adds a note to vendor.conf and runc.installer to describe the order
in which runc should be updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-17 00:49:56 +01:00
Sebastiaan van Stijn
a5e2dd2bb1
Merge pull request #38128 from kolyshkin/runc
Do not enable kmem on RHEL7 kernels
2018-11-12 15:20:24 +01:00
Vincent Demeester
13e9563d42
Merge pull request #38123 from thaJeztah/bump_swarmkit
Bump SwarmKit to 8d8689d5a94ac42406883a4cef89b3a5eaec3d11
2018-11-12 08:53:25 +01:00
Sebastiaan van Stijn
6b0b9962da
Bump BurntSushi/toml to v0.3.1
No code changes, but this aligns it to a tagged version,
and updates some nested license files to MIT.

vndr doesn't vendor those nested files, so no code changes in
the vendor directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-08 19:42:57 +01:00
Kir Kolyshkin
335736fb01 Bump runc
Changes: a00bf01908...9f1e94488e

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-11-06 10:45:24 -08:00
Sebastiaan van Stijn
dd7799afd4
update containerd client and dependencies to v1.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-05 18:46:26 +01:00
Sebastiaan van Stijn
be3843c8c8
Bump SwarmKit to 8d8689d5a94ac42406883a4cef89b3a5eaec3d11
Changes included;

- docker/swarmkit#2735 Assign secrets individually to each task
- docker/swarmkit#2759 Adding a new `Deallocator` component
- docker/swarmkit#2738 Add additional info for secret drivers
- docker/swarmkit#2775 Increase grpc max recv message size
  - addresses moby/moby#37941
  - addresses moby/moby#37997
  - follow-up to moby/moby#38103

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-01 13:23:40 +01:00
Sebastiaan van Stijn
87558ad4dd
update libnetwork to fix iptables compatibility on debian
Fixes a compatibility issue on recent debian versions, where iptables now uses
nft by default.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-01 02:47:28 +01:00
Sebastiaan van Stijn
1527a67212
Merge pull request #37999 from Microsoft/jjh/tar2vhd
LCOW: ApplyDiff() use tar2ext4, not SVM
2018-10-24 22:35:34 +02:00
Anshul Pundir
93e1c5a5b7 Vendor swarmkit to a84c01f49091167dd086c26b45dc18b38d52e4d9.
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
2018-10-17 16:33:35 -07:00
Vincent Demeester
4c3926a997
Merge pull request #38048 from AkihiroSuda/runc-20181016
bump up runc
2018-10-16 18:29:46 +02:00
Akihiro Suda
06646dc9b4
Merge pull request #38024 from thaJeztah/bump_swarmkit
Bump swarmkit to 7d5d33b97794440462a04acdd3f31914da8f66f3
2018-10-16 19:32:29 +09:00
Akihiro Suda
275044bbc3 bump up runc
Changes: 69663f0bd4...a00bf01908

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-16 14:31:19 +09:00
Flavio Crisciani
e143b8fa4e
Vendor libnetwork
- DSR support for linux
- increase max DNS pending query from 100->1024
- DNs to handle NXDOMAIN, REFUSED

diff:
20461b8539...d7b61745d1

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-10-12 08:44:48 -07:00
Sebastiaan van Stijn
8dedcb8c51
Bump swarmkit to 7d5d33b97794440462a04acdd3f31914da8f66f3
Relevant changes;

- swarmkit#2681 Handle an edge case in CA rotation where we reclaim CA service from an external CA
- swarmkit#2750 Use gometalinter; switch from x/net/context -> context

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-11 23:03:18 +02:00
Sebastiaan van Stijn
9cfce30214
bump buildkit to c7bb575343df0cbfeab8b5b28149630b8153fcc6
Relevant changes:

- buildkit#667 gateway: check for `ReadDir` and `StatFile` caps on client side
- buildkit#668 dockerfile: fix ssh required option
- buildkit#669 dockerfile: update default copy image
- buildkit#670 solver: specify SSH key ID in error message when required key was not forwarded
- buildkit#673 solver: fix possible nil dereference
- buildkit#672 fix setting uncompressed label on content
- buildkit#680 dockerfile: fix empty dest directory panic

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-11 21:48:26 +02:00
John Howard
d03ab10662 Vendor Microsoft/hcsshim @ v0.7.9
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-10-09 18:15:59 -07:00
Tibor Vass
5fae0ddb2b
Merge pull request #37973 from AkihiroSuda/bk20181005
bump up buildkit
2018-10-05 15:09:41 -07:00
Akihiro Suda
837b9c6214 bump up buildkit
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-05 18:33:03 +09:00
Sebastiaan van Stijn
dd622c81a4
Update containerd client and dependencies to v1.2.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-04 15:20:34 +02:00
Sebastiaan van Stijn
31a9c9e791
Update containerd dependencies
This updates the containerd dependencies to match
the versions used by the vendored containerd version

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-04 15:19:53 +02:00
Sebastiaan van Stijn
deac65c929
Merge pull request #37850 from AkihiroSuda/propagate-exec-root-to-libnetwork
daemon: propagate exec-root to libnetwork-setkey
2018-09-28 15:20:37 +02:00
Tibor Vass
e161a8d1e9 vendor buildkit to 8f4dff0d16ea91cb43315d5f5aa4b27f4fe4e1f2
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-27 21:21:49 +00:00
Brian Goff
d0970ab9a4
Merge pull request #37875 from Microsoft/jjh/bumpopengcs
Bump Microsoft/opengcs to v0.3.9
2018-09-26 10:19:26 -07:00
Tibor Vass
82388d048a vendor: update swarmkit to 9f271c2 and remove boltdb
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-24 17:36:07 +00:00
Tibor Vass
d0f00bc1fb builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-21 20:43:26 +00:00
Tõnis Tiigi
b1116479b2
Merge pull request #37852 from AntaresS/patch-buildkit
add support for "registry-mirrors" and "insecure-registries" to buildkit
2018-09-21 09:42:35 -07:00
John Howard
e57b2a8066 Bump containerd to d97a907f
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-18 10:26:13 -07:00
John Howard
c82f6a8faf Bump Microsoft/opengcs to v0.3.9
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-18 10:13:24 -07:00
Anda Xu
308701fac6 update vendor
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-09-16 12:57:17 -07:00
Yong Tang
2d7aa92b7d
Merge pull request #37805 from kolyshkin/bump-etcd
vendor: bump etcd to v3.3.9
2018-09-15 06:18:08 -07:00
Akihiro Suda
40385208cb daemon: propagate exec-root to libnetwork-setkey
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-09-15 13:49:30 +09:00
Sebastiaan van Stijn
9299561bd3
Merge pull request #37736 from selansen/master
Global Default AddressPool - Update
2018-09-14 18:47:42 +02:00
Akihiro Suda
5adee401d1
Merge pull request #37843 from Microsoft/jjh/boltdb
Revendor libnetwork @ 36d3bed0e9
2018-09-14 23:22:36 +09:00
Tibor Vass
9d276b8afd
Merge pull request #37644 from AntaresS/handle-cgroups
propagate the dockerd cgroup-parent config to buildkitd
2018-09-13 14:19:45 -07:00
John Howard
4ddebbe77f Vendor libnetwork @ 36d3bed0e9
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-13 13:52:45 -07:00
John Howard
1a6e2609ea Vendor libkv @ 458977154600b9f23984d9f4b82e79570b5ae12b
Signed-off-by: John Howard <jhoward@microsoft.com>

This also adds go.etcd.io/bbolt as boltdb/bolt is no longer
maintained, and we need https://github.com/etcd-io/bbolt/pull/122 which
was merged in https://github.com/etcd-io/bbolt/releases/tag/v1.3.1-etcd.8
in order to fix https://github.com/docker/libnetwork/issues/1950.

Note that I can't entirely remove boltdb/bolt as it is still used by
other components. Still need to work my way through them.... These include
containerd/containerd (https://github.com/containerd/containerd/pull/2634),
docker/swarmkit; moby/buildkit. And probably more....
2018-09-13 12:37:15 -07:00
Kir Kolyshkin
7008ac01fa vendor: bump etcd deps
As per https://github.com/etcd-io/etcd/blob/fa57f7fbc787b4/Gopkg.lock

List of packages required by subset of etcd used is provided by:

go list -f '{{join .Deps "\n"}}' \
 github.com/docker/docker/vendor/github.com/coreos/etcd/... \
 | grep -F . | grep -v coreos/etcd | sort | uniq

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-13 00:54:20 -07:00
Kir Kolyshkin
a77a2a406c vendor: bump etcd to v3.3.9
...and use ugorji/go 1.1.1

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-13 00:54:20 -07:00
selansen
148ff00a0a Global Default AddressPool - Update
Addressing few review comments as part of code refactoring.
Also moved validation logic from CLI to Moby.

Signed-off-by: selansen <elango.siva@docker.com>
2018-09-11 19:02:54 -04:00
John Howard
ddd4adb00a Bump Microsoft/hcsshim to v0.7.3
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-10 10:19:32 -07:00
Yong Tang
703a04ebc9
Merge pull request #37712 from Microsoft/jjh/detach
Windows: Try to detach sandbox on cleanup to avoid permission denied
2018-09-09 16:50:27 -07:00
Anda Xu
54b3af4c7d update vendor
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-09-07 17:48:41 -07:00
Sebastiaan van Stijn
ec99bd6ab8
Merge pull request #37358 from kolyshkin/go111
Bump golang to 1.11.0
2018-09-07 09:35:33 +01:00
Kir Kolyshkin
10fd0516b9 Bump golang to 1.11.0
It's that time of year again! Go 1.11 is released, time to use it.

This commit also

* removes our archive/tar fork, since upstream archive/tar
  is fixed for static builds, and osusergo build tag is set.

* removes ENV GO_VERSION from Dockerfile as it's not needed
  anymore since PR #37592 is merged.

[v2: switch to beta2]
[v3: switch to beta3]
[v4: rc1]
[v5: remove ENV GO_VERSION as PR #37592 is now merged]
[v6: rc2]
[v7: final!]
[v8: use 1.11.0]
[v9: back to 1.11]
[v8: use 1.11.0]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-06 15:24:44 -07:00
Kir Kolyshkin
bac67204e1 vendor: bump containerd/continuity
This is to include the Go 1.11 fix
(https://github.com/containerd/continuity/pull/120).
Again (see c64a2448d1).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-06 15:24:22 -07:00
Kir Kolyshkin
09921ca33f Revendor ugorji/go
To include the following backported fix:

https://github.com/kolyshkin/ugorji-go/commit/1cf431c13dec46596

which should fix this:

> 13:40:53 vendor/github.com/ugorji/go/codec/gen-helper.generated.go:1:
> possible malformed +build comment%!(EXTRA []interface {}=[])

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-06 15:24:19 -07:00
John Howard
66966941f9 Vendor Microsoft/go-winio v0.4.11
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-06 09:54:24 -07:00
Kir Kolyshkin
92e7543903 vendor: update tar-split
To include https://github.com/vbatts/tar-split/pull/48 which
fixes the issue of creating an image with >8GB file in it.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-09-06 09:43:41 -07:00
Tibor Vass
effa24bf48 vendor buildkit to fix a couple of bugs
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-04 15:17:40 +00:00
Sebastiaan van Stijn
41481abdc6
Merge pull request #37674 from Microsoft/jjh/revendor82018
Revendor Microsoft/hcsshim and go-winio, plus container/containerd
2018-08-25 19:54:22 +02:00
John Howard
2e5222a346 Bump containerd to 3f42445e38d1081f4b8c3b8d7d1ed1860198ed7a
Signed-off-by: John Howard <john.howard@microsoft.com>
2018-08-23 12:03:43 -07:00
John Howard
805211a6e8 Revendor hcsshim and go-winio
Signed-off-by: John Howard <john.howard@microsoft.com>
2018-08-23 12:03:33 -07:00
Tibor Vass
dc7e472db9 builder: fix bridge networking when using buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-23 05:20:01 +00:00
Tibor Vass
16084ea8c8 builder: temporarily disable bridge networking when using buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-22 03:29:17 +00:00
Tibor Vass
1800883bd1
Merge pull request #37558 from selansen/master
Global Default Address Pool feature support
2018-08-20 18:15:44 -07:00
selansen
f7ad95cab9 Global Default Address Pool feature support
This feature allows user to specify list of subnets for global
default address pool. User can configure subnet list using
'swarm init' command. Daemon passes the information to swarmkit.
We validate the information in swarmkit, then store it in cluster
object. when IPAM init is called, we pass subnet list to IPAM driver.

Signed-off-by: selansen <elango.siva@docker.com>
2018-08-20 15:07:08 -04:00
Tonis Tiigi
bc67a78862 vendor: update buildkit to 46f9075a
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-20 18:54:10 +00:00
Sebastiaan van Stijn
7d4fa69e33
Merge pull request #37664 from dmcgowan/vendor-containerd-1.2
Update containerd vendor to 1.2 beta
2018-08-18 22:22:41 +01:00