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

711 Коммитов

Автор SHA1 Сообщение Дата
Satoshi Tagomori 53ed17449e Update fluent-logger-golang to v1.2.1
This fixes a regression bug not to connect the destination node twice or more.
That regression was brought by v1.2.0, and it also makes many goroutines for
first reconnection (these will finish after first reconnection established).

Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
2016-10-18 11:26:32 +09:00
Carlos Alexandro Becker 0f4db1cc59
Added logentries dependency to vendor
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
2016-10-17 22:06:39 -02:00
Madhu Venugopal 88cae7412d Vendoring Swarmkit 1fed8d2a2ccd2a9b6d6fb864d4ad3461fc6dc3eb
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-10-15 08:49:55 -07:00
cyli 5f4dcd8252 Bump vendored and dockerfile notary version to v0.4.2
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-10-14 17:52:56 -07:00
Jana Radhakrishnan 9ae9f9812b Vendoring libnetwork @04025f2a2eebb
Fixes #27323

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-14 11:12:24 -07:00
Anusha Ragunathan 1845f506e4 Vendor libnetwork.
This is primarily for plugingetter import path change.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-11 13:09:01 -07:00
Madhu Venugopal 5ff17cb4aa Merge pull request #26954 from mrjana/net
Vendoring libnetwork @7b74403
2016-10-11 05:59:35 -07:00
John Howard 97ac469934 Windows: Update go-winio to 0.3.5
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-10 15:08:17 -07:00
Jana Radhakrishnan 83ba14a552 Vendoring libnetwork @7b74403be424
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-10 14:39:02 -07:00
Justin Cormack 5ee2c2a647 Merge pull request #27160 from mlaventure/update-containerd
Update containerd and runc
2016-10-06 19:36:31 +02:00
Kenfe-Mickael Laventure 7e12c3bb99 Update containerd and runc
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-05 14:47:15 -07:00
Darren Stahl 267c04aa36 Revendor hcsshim to v0.5.1
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-05 14:40:51 -07:00
Alexander Morozov 921a0bf686 Merge pull request #26932 from dmcgowan/update-tar-split
Update tar split
2016-10-05 13:45:07 -07:00
Michael Crosby 214b70e6ef Merge pull request #27038 from jstarks/non_base_utilityvm
Windows: support Windows servicing layers
2016-10-05 10:02:31 -07:00
John Starks cab70c391f Windows: Revendor hcsshim v0.4.5
This update adds support for non-base layers that have utility VM updates
and hard links. This is necessary to support Microsoft-released layers
with servicing updates.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-10-03 11:00:04 -07:00
Anusha Ragunathan 009f741351 Vendor docker/swarmkit changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-03 10:59:38 -07:00
Anusha Ragunathan 2b0f0d0d71 Vendor in docker/libnetwork.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-03 10:40:05 -07:00
Michael Crosby 97660c6ec5 Merge pull request #26961 from Microsoft/jjh/oci
Windows: OCI runtime spec compliance
2016-09-30 10:13:57 -07:00
John Howard ba2df17493 Revendor OCI runtime-spec 1c7c27d043c2
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-27 12:05:47 -07:00
Derek McGowan e338217770
Update tar split
Pulls in fix for tar split disassembly incorrectly storing the padding
at the end of the file, leading to a hash difference on the
re-assembled tar archive.

Closes #26434

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-09-27 09:57:56 -07:00
Yong Tang 8f4afb86ee Revendor swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
This commit updates swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-26 23:48:16 -07:00
Yong Tang f4e94617f0 Revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
This commit revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
to improve error message for removing pre-defined (e.g., `ingress`) network.

This commit is related to 24538.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-24 12:14:04 -07:00
Jana Radhakrishnan cd20621201 Vendoring libnetwork @bf3d9ccfb8e
Fixes certain node management issues when a daemon is restarted or fails
or leaves and joins a swarm.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-23 16:06:38 -07:00
Jake Sanders b264632904 make GetAll use client.List as the source of truth
Signed-off-by: Jake Sanders <jsand@google.com>
2016-09-23 11:48:15 -07:00
Jana Radhakrishnan 746113d584 Vendoring libnetwork @6caf9022fa09
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-22 21:00:32 -07:00
msabansal 522930cfb3 Vendoring dependencies
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-09-22 12:21:28 -07:00
Sebastiaan van Stijn 45818d6fc4
Removed engine-api leftovers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-21 12:36:52 +02:00
Vincent Demeester 758a809f54 Merge pull request #26538 from LK4D4/update_grpc
Update grpc to v1.0.1-GA
2016-09-20 23:19:26 +02:00
Alexander Morozov eeceb0ccc8 vendor: update containerd and swarmkit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-20 09:24:36 -07:00
Satoshi Tagomori 87124b9d62 Update fluent-logger-golang to v1.2.0.
Fix race condition issue to solve an issue about "panic: runtime error: invalid memory address or nil pointer dereference".
This fix stabilize Docker daemon under the situation of communication problem with Fluentd processes.

Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
2016-09-20 20:31:22 +09:00
Brian Goff f528690674 re-vendor syslog package
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-17 10:25:05 -04:00
Tõnis Tiigi 4adbd5338d Merge pull request #26583 from aboch/vnd
Vendoring libnetwork @c8ce8c7
2016-09-15 20:28:07 -07:00
Alexander Morozov afe23cea3d vendor: update grpc and protobuf
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-15 11:36:31 -07:00
Alessandro Boch 5cfbdceafe Vendoring boltdb @fff57c100
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-15 10:53:48 -07:00
Alessandro Boch 161c121425 Vendoring libnetwork @c8ce8c7
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-14 14:46:05 -07:00
Alexander Morozov e4ddcb37c1 libcontainerd: use healthcheck to track containerd conn
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-12 14:22:38 -07:00
Madhu Venugopal 130db0a489 Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
Vendor libnetwork @51d88e9ae63f
2016-09-10 06:00:32 -07:00
Vincent Demeester 4c3f2e7c37 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
Restrict size to 2 fractional digits for `docker images`
2016-09-10 11:32:45 +02:00
root 7d8048de06 Vendor libnetwork @51d88e9ae63f
- Fixes #26440

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-09-09 18:57:15 +02:00
boucher 6bc9a2d563 Update containerd to fix unkillable restored containers.
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-08 21:31:56 -04:00
Yong Tang 6866fda800 Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-08 18:26:50 -07:00
Jana Radhakrishnan 99c3968098 Vendor libnetwork @00e7660daeb4
- Fixes #25325
  - Fixes certain issues with workers leaving swarm and rejoining
  - Adds cluster provider interface methods to support docker run on
    overlay in swarm mode.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-07 15:11:48 -07:00
Jana Radhakrishnan 39143ef15d Vendor swarmkit @27fbaef4ceed6
Adds a new task runtime to support network attachmemt for plain old
docker containers so that they can participate multi-host networks and
get access to services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-07 11:52:49 -07:00
Cao Weiwei c6edecc2d6 Remove redundant word
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
2016-09-06 23:21:41 +08:00
Vincent Demeester c73fae2352 Merge pull request #26290 from tonistiigi/govet17
Fix govet for go1.7
2016-09-03 19:27:19 +02:00
Tonis Tiigi 7a8c7b47cf Fix govet for go1.7
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-09-02 19:07:54 -07:00
Antonio Murdaca 8f7a8c75ae
vendor docker/engine-api@f9cef59044
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-31 22:39:13 +02:00
Victor Vieux 63a19edcb1 add -f to plugin inspect
Signed-off-by: Victor Vieux <vieux@docker.com>

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-25 22:40:05 -07:00
Tibor Vass ed0dff8f16 Merge pull request #25424 from vieux/enabled
replace active by enabled for consistency in plugins
2016-08-26 15:22:41 -07:00
Victor Vieux cf4e268115 replace active by enabled for consistency in plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-25 20:42:49 -07:00
Daniel Nephin ac40179e8a Update spf13/cobra vendor to v1.4.1
Support command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-25 13:09:03 -04:00
Tonis Tiigi ee030251f2 vendor: update swarmkit in 8a761950f
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-22 11:36:06 -07:00
Brian Goff 09e1de2080 Merge pull request #25843 from darrenstahlmsft/RevendorHcsshim
Vendor hcsshim to v0.4.2
2016-08-18 17:21:02 -04:00
Darren Stahl ba54581c3d Vendor hcsshim to v0.4.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-08-18 12:53:01 -07:00
Anusha Ragunathan 764d97444e Vendor distribution changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-08-18 09:30:31 -07:00
Brian Goff d8e12f8755 Merge pull request #25809 from justincormack/patricia
Update go-patricia to 2.2.6
2016-08-17 15:25:17 -04:00
Justin Cormack d16f96262e Update go-patricia to 2.2.6
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 19:02:32 +01:00
Michael Crosby 041e5a21dc Replace old oci specs import with runtime-specs
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn 5e2a519957 Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim
Revendor hcsshim to v0.4.1
2016-08-17 10:50:00 +02:00
Darren Stahl c58d0358c3 Revendor hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-08-16 17:28:49 -07:00
Brian Goff 37302bbb3f Merge pull request #25721 from cpuguy83/revendor_engine-api
revendor engine-api
2016-08-16 17:18:43 -04:00
Brian Goff 6d98e344c7 revendor engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-16 14:16:12 -04:00
Alexander Morozov 6f06afab2a Merge pull request #25739 from mrjana/vendor
Vendoring libnetwork @82fb373e3eaa4e
2016-08-16 08:01:16 -07:00
John Howard 3c6f4cd5a6 Merge pull request #25143 from cpuguy83/update_go-check
Add stack dumps from the daemon(s) on test timeout
2016-08-15 22:09:20 -07:00
Jana Radhakrishnan 56c9822695 Vendoring libnetwork @82fb373e3eaa4e
- Fixes a SNAT issue in loadbalancer when multiple networks are involved
  - Fixes an issue with SRV query forwarding in DNS
  - Fixes a map race

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-08-15 17:53:35 -07:00
Brian Goff b0431d63dc Merge pull request #25635 from dperny/rate-limit-swarm-pull-log
Rate limit logspam during docker service pulls
2016-08-12 13:06:39 -04:00
Vincent Demeester 4f20721c9a Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd
Vendor new swarmkit and etcd/raft
2016-08-12 11:10:58 +02:00
Santhosh Manohar b9c9fa2855 Vendoring libnetwork for 1.12.1-rc1
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-08-11 18:44:32 -07:00
Aaron Lehmann be48cfc8eb Vendor new swarmkit and etcd/raft.
This brings in a much newer version of etcd/raft.

An unrelated change in swarmkit should fix some problems with
integration tests on ARM.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-08-11 18:35:21 -07:00
Drew Erny fa0054a3eb Rate limit logspam during docker service pulls
During image pulls on docker service create, logs will only show status
updates and updates every 1 second on long-running actions like
downloading and extracting. Adds golang.org/x/time/rate as dependency.

Ports docker/swarmkit#1352 to docker/docker.

Signed-off-by: Drew Erny <drew.erny@docker.com>
2016-08-11 14:56:38 -07:00
Madhu Venugopal 6645ff8ac1 Vendoring libnetwork for 1.12.1-rc1
* Fixes https://github.com/docker/docker/issues/25236
* Fixes https://github.com/docker/docker/issues/24789
* Fixes https://github.com/docker/docker/issues/25340
* Fixes https://github.com/docker/docker/issues/25130
* Fixes https://github.com/docker/libnetwork/issues/1387
* Fix external DNS responses > 512 bytes getting dropped
* Fix crash when remote plugin returns empty address string
* Make service LB work from self
* Fixed a few race-conditions

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-08-11 00:12:43 -07:00
Tonis Tiigi 3b555a575d vendor: update swarmkit to cb6d8131
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-10 13:27:38 -07:00
Brian Goff 51771a3094 re-vendor go-check
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-09 09:27:58 -04:00
unclejack 34877a41a8 Merge pull request #25510 from justincormack/patricia-2.2.5
Update go-patricia to 2.2.5
2016-08-09 01:06:53 -07:00
Justin Cormack b2b41b2194 Merge pull request #25502 from LK4D4/update_gorilla
vendor: use tags for gorilla projects
2016-08-08 23:28:15 +01:00
Justin Cormack e4402b285b Update go-patricia to 2.2.5
Fixes an issue that showed up on gccgo.

Fix #25360

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-08 22:28:41 +01:00
Alexander Morozov 98530ac8e2 vendor: use tags for gorilla projects
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-08 11:58:32 -07:00
allencloud fc63bb83ca update go-units vendor to newest version
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-09 00:10:19 +08:00
Victor Vieux 0016b331da Add --force to docker plugin remove
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-04 15:55:45 -07:00
Diogo Monica a327c231b5 Add --force to node removal
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
2016-08-01 18:55:58 -07:00
unclejack 3d714b5ed5 vendor.sh: bump go-patricia to 2.2.4 to fix leaks
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-08-01 12:21:19 +03:00
Madhu Venugopal 61e59693dc Vendoring libnetwork to avoid a deadlock
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
2016-07-28 15:12:45 -07:00
Aaron Lehmann 96b2a6e548 Remove join-tokens from the /info API
join-tokens are not needed for this endpoint, and should not be as part
of /info

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit d8f3b3f006629c5c1368eca96bcd5bda2a54acd7)
2016-07-27 18:11:51 -07:00
Madhu Venugopal b1ae883d3f Vendoring libnetwork to fix #25109
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-27 08:41:46 -07:00
Tibor Vass 9fc2eee2b5 Merge pull request #25050 from aaronlehmann/vendor-swarmkit-rc5
Vendor swarmkit for 1.12.0-rc5
2016-07-26 01:47:34 -07:00
Tibor Vass 9ee430fcf5 Merge pull request #25042 from tiborvass/carry-24492
Carry 24492: Remove swarm inspect and use info instead
2016-07-26 01:11:37 -07:00
Aaron Lehmann 60496af711 Vendor swarmkit for 1.12.0-rc5
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-26 00:45:07 -07:00
Vincent Demeester e6923f6d75 Remove swarm inspect and use info instead
Remove the swarm inspect command and use docker info instead to display
swarm information if the current node is a manager.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-25 20:31:10 -07:00
Tibor Vass e3c150bd47 vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 20:31:10 -07:00
Madhu Venugopal 6a754a4eef Vendoring libnetwork to remove stale xfrm states
When using encrypted vxlan network, some of the xfrm states are left
stale. This fix also filters out self advertise-addr rules.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-25 19:44:07 -07:00
Tibor Vass c65925f24b Merge pull request #24943 from aaronlehmann/rolling-updates
Add failure action for rolling updates
2016-07-25 10:15:28 -07:00
Madhu Venugopal 56b78ab2f2 Vendoring libnetwork for rc5
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-24 20:08:00 -07:00
Aaron Lehmann 3585026c3a Revendor engine-api
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 11:13:13 -07:00
Aaron Lehmann 24d2d53f5d Vendor libnetwork and github.com/vishvananda/netlink
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:22:36 -07:00
Aaron Lehmann d626875a94 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:22:32 -07:00
Sebastiaan van Stijn 9a3e47511a
bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-23 01:05:45 +02:00
Tibor Vass f5e1f6f688 Merge pull request #24823 from aaronlehmann/join-tokens
Replace secrets with join tokens
2016-07-21 18:06:55 -07:00
Aaron Lehmann aaa0f0b246 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Aaron Lehmann 852091ad41 Revendor engine-api
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Alexandre Beslic 5189e3d50d update libkv, fix wrong error check on zookeeper list
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-07-20 17:25:39 -07:00