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

138 Коммитов

Автор SHA1 Сообщение Дата
Sebastiaan van Stijn 5f057f6350
un-fork go-memdb
commit 9322636c89
temporarily switched to a fork of go-memdb, because
a pull request that was needed was not yet merged
upstream.

this pull request was merged, so we can un-fork
this dependency.

this change does not bump the dependency, and
only un-forks. bumping the dependency should
be done in a separate change, if needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-09 15:05:49 +01:00
Stephen J Day 083ad52f60
vendor: update dependencies for go-digest
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-01-06 18:48:52 -08:00
Alexander Morozov fad6db4465 Merge pull request #29927 from aaronlehmann/vendor-swarmkit-2e956c4
Revendor swarmkit to 2e956c4
2017-01-06 17:09:21 -08:00
Aaron Lehmann b1f5320dd6 Revendor swarmkit to 2e956c4
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-05 14:55:52 -08:00
Aaron Lehmann 11df2db538 vendor: Unfork logrus dependency
Vendor the latest official logrus release instead of a custom fork
(which now happens to be identical to the fork).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-05 14:19:08 -08:00
Aaron Lehmann 428600108c plugingetter: Avoid all caps for constant declarations
Go style calls for mixed caps instead of all caps:
https://golang.org/doc/effective_go.html#mixed-caps

Change LOOKUP, ACQUIRE, and RELEASE to Lookup, Acquire, and Release.

This vendors a fork of libnetwork for now, to deal with a cyclic
dependency issue. The change will be upstream to libnetwork once this is
merged.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-04 10:19:04 -08:00
Akihiro Suda 59f6f6bc01 Merge pull request #29852 from thaJeztah/bump-go-units
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
2017-01-04 07:54:45 +09:00
Sebastiaan van Stijn 0e16b5cb3a
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-03 18:43:25 +01:00
Madhu Venugopal d2079a7789 Vendoring libnetwork to bring in isbuiltin changes
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-30 12:26:40 -08:00
Tõnis Tiigi edaa3c6f07 Merge pull request #29609 from dnephin/add-compose-file-package
Replace the vendored aanand/compose-file with a local copy
2016-12-29 15:12:59 -08:00
Brian Goff b0aab6e83e Merge pull request #29475 from AkihiroSuda/vendor-oauth2-3
Vendor gcplogs deps
2016-12-28 11:55:03 -05:00
Daniel Nephin f5af9b9738 Replace vendor of aanand/compose-file with a local copy.
Add go-bindata for including the schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-27 16:17:24 -05:00
Tõnis Tiigi aecb79ff98 Merge pull request #29339 from dmcgowan/plugins-abstract-download-manager
Abstract layerstore from pull/push distribution code
2016-12-19 13:32:28 -08:00
Derek McGowan 61ac7c4bf8
Update distribution vendor for manifest builder change
Manifest builder allows setting the configuration type
for the manifest being build. Additionally the default
type has been renamed to reflect it is an image type.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2016-12-19 10:54:55 -08:00
Akihiro Suda ff2f875574 vendor: google.golang.org/cloud -> cloud.google.com/go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 08:36:18 +00:00
Akihiro Suda 44b95265df vendor oauth2@96382aa0 and add its deps
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 04:37:47 +00:00
Aaron Lehmann 423ba6f223 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 17:02:48 -08:00
Madhu Venugopal 8e6969d846 Vendor libnetwork with experimental daemon flag handling
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-13 14:22:48 -08:00
Santhosh Manohar b6b6d3ade4 Vendor libnetwork @4df06c4
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-12-12 00:29:54 -08:00
Yong Tang 3c1c992271 Revendor swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f
This fix updates swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f.

This fix is needed by #29074 (docker PR) and is related to
docker/swarmkit#1789 (swarmkit PR) and #29044

This fix may be needed for 1.13.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-09 16:28:51 -08:00
Victor Vieux ab65ac6bc4 Merge pull request #29233 from aaronlehmann/vendor-swarmkit-5fe1f720
Update vendored swarmkit to 5fe1f720
2016-12-09 14:49:14 -08:00
Victor Vieux c1a1b381f9 Merge pull request #28459 from dmcgowan/plugin-repository-pinning
Plugin repository pinning
2016-12-08 11:28:52 -08:00
Aaron Lehmann 4441e390d0 Update vendored swarmkit to 5fe1f720
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-07 18:06:28 -08:00
Akihiro Suda 7375507eea Vendor swarmkit
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-05 04:56:40 +00:00
Madhu Venugopal 8f082e418b Vendoring libnetwork to address some concurrency issues
Addresses #28697, #28845, #28712, #26111

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-30 09:31:19 -08:00
Andrea Luzzardi 51247185a2 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-22 17:01:02 -08:00
Anusha Ragunathan 23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes
Plugin miscellaneous fixes
2016-11-22 16:12:37 -08:00
Sebastiaan van Stijn 61d9ba930c Merge pull request #28685 from darrenstahlmsft/RevendorGowinio
Revendor go-winio to v0.3.7
2016-11-22 21:35:45 +01:00
Tõnis Tiigi d1a137b10c Merge pull request #28681 from aboch/vnd
Vendor libkv @ 1d84310
2016-11-22 11:46:22 -08:00
Darren Stahl 873a26697d Revendor go-winio to v0.3.7
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-22 10:39:42 -08:00
Vincent Demeester 01b70a95c9
Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
This fixes services networks list to be ignored when loading.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-22 13:09:17 +01:00
Sebastiaan van Stijn fc488328b1 Merge pull request #28671 from darrenstahlmsft/RevendorHcshim
Update hcsshim to v0.5.9
2016-11-22 10:48:20 +01:00
Derek McGowan d1f5e0f7a6
Update vendor distribution
Distribution client change for class in resource

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-21 22:18:41 -08:00
Tibor Vass e2e7ab655f vendor go-connections to error out if unix socket path is too long
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-11-21 16:34:10 -08:00
Alessandro Boch f9cff5e267 Vendor libkv @ 1d84310
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 14:07:51 -08:00
Alexander Morozov 9bd7189527 Merge pull request #28673 from aboch/vnd
Vendoring libnetwork @dd0ddde
2016-11-21 13:46:14 -08:00
Alexander Morozov 9326fb1389 Merge pull request #28670 from cpuguy83/update_syslog_driver
re-vendor syslog log driver
2016-11-21 13:19:47 -08:00
Darren Stahl baac0ef67f Update hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-21 11:45:32 -08:00
Alessandro Boch 948c7fdb94 Vendoring libnetwork @dd0ddde
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 11:44:58 -08:00
Madhu Venugopal 111a95fb50 Merge pull request #28562 from tomdee/bump-libnetwork
Update libnetwork version for IPv6 support
2016-11-21 11:30:00 -08:00
Brian Goff 00caf03132 re-vendor syslog log driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-21 14:24:53 -05:00
Vincent Demeester 3739c3bed3 Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
Add support for healthcheck in compose to swarm
2016-11-21 10:28:37 +01:00
Tom Denham d96baf28d4 Update netlink library (required for libnetwork)
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2016-11-19 16:12:39 -08:00
Tom Denham 5b76fe4a35 Update libnetwork to latest version
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2016-11-19 16:12:32 -08:00
Victor Vieux a0866bd679 Merge pull request #28599 from aluzzardi/revendor-swarmkit
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
2016-11-18 16:23:54 -08:00
Andrea Luzzardi e35c1747f5 Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-18 13:32:26 -08:00
Kenfe-Mickael Laventure 8b1aeb22fe Update containerd & runc
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-18 08:15:20 -08:00
Vincent Demeester b0903c9db0
Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-18 15:08:29 +01:00
Andrea Luzzardi fbe8790759 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-16 18:15:15 -08:00
Nishant Totla d910781c66
Updating docker/distribution vendoring
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-14 15:31:25 -08:00
Tõnis Tiigi d06b1e2cc2 Merge pull request #28285 from vieux/try_arm_fix_libnetwor
update libnetwork to fix ARM tests
2016-11-11 08:32:29 -08:00
Vincent Demeester bc739a8d70 Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:18:34 +01:00
Ian Campbell f02221a794 pkg/jsonmessage: Use terminfo rather than open coding ANSI escape codes
Although our use of ANSI codes here is rather simple it is generally good
practice to use terminfo in order to be portable to different terminal
emulators.

Vendor github.com/Nvveen/Gotty (actually my fork with a fix, see
https://github.com/Nvveen/Gotty/pull/1) and use that to parse the terminfo
files.

Note that "\e]2K" (clear entire line) is not covered by terminfo. We can
achieve the same end by first clearing from begining of line to cursor
(el1="\e]1K") and then clearing from cursor to end of line (el="\e]k").

Test suite has been updated and forces (either directly or by setting $TERM to
something highly unlikely to exist) the use of the non-terminfo fallbacks which
retains the same output behaviour as previously. This is preferable even to
relying on a well-known and relatively static terminfo (like vt102) since even
that in principal might have different terminfo encodings.

In case terminfo is not available at all for $TERM or doesn't expose the
specific capabilities which we use then fall back to the previous manual
escapes, with the exception that we avoid "\e]2K" as discussed above.

Tested with a manual docker pull with rxvt-unicode ($TERM=rxvt-unicode), xterm
($TERM=xterm), mlterm ($TERM=mlterm) and aterm ($TERM=kterm).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-11 11:40:53 +00:00
Vincent Demeester f3dcae7dd3 Update compose-file to 8cff34df885ef07824138236bc4d27d359888b17
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 11:25:57 +01:00
Victor Vieux 84264e9461 fix ARM unsafe access
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 23:55:38 -08:00
Tõnis Tiigi 48a0c3e831 Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
Fix registry authorization errors
2016-11-10 19:39:28 -08:00
Victor Vieux 750d634d62 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
2016-11-10 17:59:57 -08:00
Derek McGowan 60ecc132c5
Update distribution vendor
Pull in client changes to handle oauth errors

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 17:34:12 -08:00
Victor Vieux acd6e0d9b2 Merge pull request #28226 from vieux/exit_exp_plugin
move plugins out of experimental
2016-11-10 17:30:54 -08:00
Tõnis Tiigi d54f4472fd Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
Fix failure to get containers when deleting a layer
2016-11-10 17:10:05 -08:00
Victor Vieux 970b23db2e update media_type
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
Darren Stahl d0e1949d22 Vendor update hcsshim to v0.5.8
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-10 14:06:57 -08:00
Victor Vieux f700a86dc0 Merge pull request #28257 from sanimej/iptables
vendor libnetwork @1861587
2016-11-10 14:01:02 -08:00
Santhosh Manohar 90bc2756ed vendor libnetwork @1861587
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-10 12:04:28 -08:00
cyli b399d29a57 Vendor the latest swarmkit PR
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-11-10 11:53:02 -08:00
Sandeep Bansal 6e95165679 Vendoring latest swarmkit and libnetwork
Signed-off-by: Sandeep Bansal <msabansal@microsoft.com>
2016-11-10 09:54:47 -08:00
Daniel Nephin ed35648151 Vendor dependencies for compose-file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
Tonis Tiigi 472ecae0d8 vendor: update errors to 839d9e91
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-09 16:09:00 -08:00
Tonis Tiigi 2a68f0f001 vendor: update swarmkit to bddd3f0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-09 16:08:52 -08:00
Victor Vieux 8ffd1a370c Merge pull request #28025 from vdemeester/swarm-mode-templating
Add support for swarm mode templating
2016-11-09 15:57:52 -08:00
Vincent Demeester 6e885540a2 Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-09 22:38:24 +01:00
John Howard d936a77160 Revendor Microsoft/go-winio to v0.3.6
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 17:59:01 -08:00
Sebastiaan van Stijn 703dcbe579 Merge pull request #28175 from Microsoft/jjh/hcsshim0.5.6
Revendor Microsoft/HCSShim v0.5.7
2016-11-09 00:37:13 +01:00
John Howard 8ae9160643 Revendor Microsoft/HCSShim v0.5.7
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 12:09:11 -08:00
Kenfe-Mickael Laventure 0aa17f0f60 Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
This version:
 - properly follow context cancellation on Start and Exec
 - add support for Solaris
 - ensure exec exit events are always seen before init's

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-08 09:47:41 -08:00
Brian Goff 16ea0806f8 Merge pull request #28140 from tonistiigi/update-fifo
vendor: update fifo to 14056439
2016-11-08 12:31:03 -05:00
Yong Tang f0e2eb24cf Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.

This fix is related to 28031.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-07 17:57:20 -08:00
Tonis Tiigi bebfcade04 vendor: update fifo to 14056439
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-07 16:19:03 -08:00
Dong Chen aba4190612 Vendor libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-11-04 21:50:56 -07:00
Sebastiaan van Stijn 1c62d8619d Merge pull request #28081 from LK4D4/update_for_solaris
vendor: update package for solaris support
2016-11-04 17:01:16 -07:00
Alexander Morozov bb1153a613 Merge pull request #28077 from aluzzardi/swarmkit-revendoring
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
2016-11-04 14:59:05 -07:00
Alexander Morozov 553b0b9731 vendor: update package for solaris support
Update includes next packages:
* golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
* github.com/fsnotify/fsnotify v1.2.11
* github.com/tonistiigi/fifo b4c3a126bac4051ae3fa83bfcb3c60ab7a9da0dd

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-04 14:39:47 -07:00
Victor Vieux f6edbdf883 Merge pull request #28010 from vieux/fix_experimental_client
always add but hide experimental cmds and flags
2016-11-04 13:49:19 -07:00
Andrea Luzzardi 014eeb539b Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-04 12:26:37 -07:00
Andrea Luzzardi 9322636c89 Revendor go-memdb to floridoo/go-memdb's fork (608dda3b1410a73eaf3ac8b517c9ae7ebab6aa87)
We are temporarily using a fork containing a PR that hasn't been merged
upstream yet.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-04 12:26:37 -07:00
Victor Vieux d34ca0178e update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-04 12:04:14 -07:00
Justin Cormack c5251f7116 Use runc version built without ambient capabilities
Until we can support existing behaviour with `sudo` disable
ambient capabilities in runc build.

Add tests that non root user cannot use default capabilities,
and that capabilities are working as expected.

Test for #27590

Update runc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-04 17:25:28 +00:00
Alexander Morozov f2614f2107 project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-03 15:31:46 -07:00