Граф коммитов

268 Коммитов

Автор SHA1 Сообщение Дата
Sebastiaan van Stijn 1375d893e9 Merge pull request #34304 from tiborvass/use-buildkit-session
Use buildkit session package
2017-07-31 11:16:27 -07:00
Tibor Vass 5898a36463 vendor github.com/moby/buildkit/session
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-07-28 16:34:24 -07:00
Flavio Crisciani 68d8198ed0
Libnetwork vendoring
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-07-28 13:51:54 -07:00
Brian Goff 08f7cf0526 Merge pull request #34123 from twistlock/plugable_secrets_backend
pluggable secret backend
2017-07-17 19:00:30 -04:00
Liron Levin 7d45cafd57 pluggable secret backend
This commit extends SwarmKit secret management with pluggable secret
backends support.

Updating the work in
[swarmkit](docker/swarmkit@eebac27434) for
pluggable secret backend and adding the
driver parameter to `SecretSpec`.

Remaining work:
- [ ] CLI support (docker/cli)
- [ ] api in [plugin helpers](docker/go-plugins-helpers))
- [ ] Reference plugin
- [ ] Documenation (after cli work)

Signed-off-by: Liron Levin <liron@twistlock.com>
2017-07-15 16:50:02 +03:00
Tonis Tiigi 72df48d1ad vendor: add archive/tar
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-07-13 19:08:19 -07:00
Sebastiaan van Stijn 96bf279c7d Merge pull request #33539 from tklauser/x-sys-unix-symlink-xattrs
Use symlink xattr functions from x/sys/unix
2017-07-12 18:04:33 -07:00
Tobias Klauser bd13a5a9e0 vendor: re-vendor golang.org/x/sys
Update golang.org/x/sys to 739734461d1c916b6c72a63d7efda2b27edb369f in
order to get the Lgetxattr, Llistxattr, Lremovexattr and Lsetxattr
syscall wrappers. These will be used in a successive commit to replace
the wrappers in libcontainer/system/xattr_linux.go.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-07-12 08:26:51 +02:00
Sebastiaan van Stijn 9fc66ec869
bump image-spec to 372ad780f63454fbbbbcc7cf80e5b90245c13e13
this commit matches what's used in SwarmKit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-11 20:52:17 -07:00
Ying Li 4509a001df Re-vendor swarmkit. This includes the following fixes:
- https://github.com/docker/swarmkit/pull/2266 (support for templating Node.Hostname in docker executor)
- https://github.com/docker/swarmkit/pull/2281 (change restore action on objects to be update, not delete/create)
- https://github.com/docker/swarmkit/pull/2285 (extend watch queue with timeout and size limit)
- https://github.com/docker/swarmkit/pull/2253 (version-aware failure tracking in the scheduler)
- https://github.com/docker/swarmkit/pull/2275 (update containerd and port executor to container client library)
- https://github.com/docker/swarmkit/pull/2292 (rename some generic resources)
- https://github.com/docker/swarmkit/pull/2300 (limit the size of the external CA response)
- https://github.com/docker/swarmkit/pull/2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- https://github.com/docker/swarmkit/pull/2271
- https://github.com/docker/swarmkit/pull/2279
- https://github.com/docker/swarmkit/pull/2283
- https://github.com/docker/swarmkit/pull/2282
- https://github.com/docker/swarmkit/pull/2274
- https://github.com/docker/swarmkit/pull/2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
2017-07-11 13:43:43 -07:00
Sebastiaan van Stijn 0ea804c240 Merge pull request #33996 from thaJeztah/un-fork-etcd
Un-fork coreos/etcd - bump to v3.2.1
2017-07-10 09:14:22 -07:00
Aaron Lehmann 733f672100 vendor: add go-semver
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-07-07 16:42:14 -07:00
John Howard 7643e89096 Revendor jhowardmsft/opengcs v0.0.9
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-07-06 14:29:43 -07:00
Sebastiaan van Stijn cbc480a40c
Un-fork coreos/etcd - bump to v3.2.1
Commit 077f08bf54
temporarily switch etcd to a fork, pending a
pull-request to be merged, and a new release
that contains the change.

The pull request was merged, and included in
etcd v3.2.0

This patch bumps etcd to v3.2.1, which contains
some bug-fixes on top of v3.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-06 13:58:13 -07:00
Sebastiaan van Stijn fe877c2b95
Remove comment about forked golang.org/x/net
This dependency was temporarily forked, but
the fork was removed in db37a86d37.

This patch removes the comment

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-02 00:19:15 -07:00
John Howard 3f14e25a7f Vendor github.com/jhowardmsft/opengcs v0.0.7
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-26 21:24:39 -07:00
Vincent Demeester 497e6e0caa
Update go-connections dependency
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-24 12:40:49 +02:00
John Howard 25a65a185b Merge pull request #33785 from Microsoft/jjh/hcsschemaupdate
LCOW: Updates necessary due to platform schema change
2017-06-23 13:08:13 -07:00
John Howard c75db46d5b Vendor jhowardmsft/opengcs v0.0.4
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-22 19:28:49 -07:00
John Howard 9508c605d8 Vendor Microsoft/hcsshim v0.5.25
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-22 19:28:43 -07:00
Sebastiaan van Stijn 9f5f3e49da Merge pull request #33738 from fcrisciani/libnetwork-vendoring
Libnetwork vendoring
2017-06-22 17:41:46 -07:00
Sebastiaan van Stijn 4d0c01ac17 Merge pull request #33773 from aaronlehmann/vendor-swarmkit-79381d0
Vendor swarmkit 79381d0
2017-06-22 16:26:34 -07:00
Tonis Tiigi 7cfcf74a90 vendor: update deps for fssession
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-22 11:22:42 -07:00
Brian Goff 4bdb6ed9b5 Merge pull request #33750 from dnephin/cleanup-more-cli-leftovers
Cleanup more cli leftovers
2017-06-21 21:23:28 -07:00
Aaron Lehmann 79b940feee Vendor swarmkit 79381d0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-21 15:32:53 -07:00
Daniel Nephin 4e5293c253 Remove miekg/pkcs11 from vendor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:18:44 -04:00
John Howard 07034a4420 Vendor jhowardmsft/opengcs v0.0.3
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:49:56 -07:00
John Howard 8fe9eb0551 Vendor Microsoft/hcsshim @ v0.5.2
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:49:55 -07:00
Flavio Crisciani e1953f1ca7
Libnetwork vendoring
Fixes in the Service Discovery areas

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-06-19 19:42:24 -07:00
Aaron Lehmann 32d7b0f360 Vendor swarmkit a4bf013
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-12 10:31:11 -07:00
Madhu Venugopal 6868b8ef23 Vendoring libnetwork f4a15a0890383619ad797b3bd2481cc6f46a978d
Contains Service Discovery hardening fixes via
https://github.com/docker/libnetwork/pull/1796

Fixes multiple issues such as #32830

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-06-12 01:01:45 -07:00
Ian Campbell 379557a958 Update grpc to v1.3.0 and bump protobuf bindings.
and update some dependent packages.

We would like to keep moby/moby and swarmkit somewhat in sync here and
https://github.com/docker/swarmkit/pull/2229 proposes a similar bump to
swarmkit, needed due to https://github.com/docker/swarmkit/pull/1965 which
pulls in containerd which uses some newer features of the grpc package.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-08 14:34:23 +01:00
Victor Vieux cd35e4beee Merge pull request #33577 from crosbymichael/revert-ONCLR
Revert ONCLR and OPOST changes
2017-06-07 21:50:38 -07:00
Michael Crosby a5e83836a4 Revert ONCLR and OPOST changes
This reverts to a version of runc without the ONCLR cleared to not cause
a regression with different clients using --tty.

This also reverts the OPOST changes to the term package to support the
initial change.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-07 13:14:52 -07:00
Madhu Venugopal 5fd65a6b6c Vendoring libnetwork and netlink
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-06-07 06:20:27 -07:00
Madhu Venugopal 0484bdb6ca Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e
Fixes #33415
Fixes #33346
Implemented few additional IPVS APIs to be used by other projects

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-05-31 16:04:00 -07:00
Vincent Demeester 6629f1d0e7 Merge pull request #33360 from aaronlehmann/vendor-swarmkit-7e096ced
Vendor swarmkit 7e096ced
2017-05-30 09:59:48 -07:00
Darren Stahl 3f13107223 Update go-winio to v0.4.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-23 18:27:50 -07:00
Aaron Lehmann 10df99f9ae Vendor swarmkit 7e096ced
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-23 15:01:35 -07:00
Aaron Lehmann aa6fc939ba vendor: Remove docker-credential-helpers
This appears to be a remnant from the CLI that is no longer imported
anywhere. Remove it from vendor.conf and the vendor directory.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-22 13:58:28 -07:00
Vincent Demeester 65f360fc41 Merge pull request #33310 from darrenstahlmsft/RevendorGowinio
Revendor go-winio to v0.4.1
2017-05-22 10:31:57 -07:00
Darren Stahl af7d8d09ef Revendor go-winio to v0.4.1
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-19 16:13:52 -07:00
Darren Stahl b90f294c1c Revendor runtime-spec
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-19 12:33:14 -07:00
Madhu Venugopal 9b0e1df4dd Vendoring libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-05-18 15:14:12 -07:00
Abhinandan Prativadi f3d8ff774e swarmkit vendoring
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-05-17 18:46:34 -07:00
Alessandro Boch 3950cef941 Vendor gogoprotobuf v0.4
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-17 15:50:28 -07:00
Alessandro Boch 8daeeacfc1 Vendor swarmkit @998a47f
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-17 15:50:28 -07:00
Alessandro Boch 46392f2442 Vendoring libnetwork @b2bc1a6
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-17 15:50:28 -07:00
Brian Goff 4dd3e5b77c Merge pull request #33075 from x1022as/stop
fix inconsistent state string with containerd
2017-05-17 09:27:47 -04:00
Aaron Lehmann 309f99edae api: Use OCI types for Digest and Platform
The current use of the types from distribution brings in some
unfortunate dependencies, including other distribution packages and the
gorilla/mux and gorilla/context packages. Using the OCI types avoids
the extra dependencies for client users.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-16 14:54:23 -07:00