docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
26,559 Commits 12 Branches 297 Tags
607f7b2a808d18d17e9195b2edb1caf7cff6faed
Commit Graph

558 Commits

Author SHA1 Message Date
Jana Radhakrishnan
607f7b2a80 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>
Upstream-commit: 56c98226955d98a2ba6a99bffd3a9a80d691e4a7
Component: engine
 2016-08-15 17:53:35 -07:00
Vincent Demeester
d24087f666 Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd 
Vendor new swarmkit and etcd/raft
Upstream-commit: 4f20721c9aefeec819a42e9a8e6f7a21e76c1534
Component: engine
 2016-08-12 11:10:58 +02:00
Santhosh Manohar
46db5e3595 Vendoring libnetwork for 1.12.1-rc1 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: b9c9fa2855cd5c7391cd026ef13a7d9d061214ee
Component: engine
 2016-08-11 18:44:32 -07:00
Aaron Lehmann
cb6631c865 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>
Upstream-commit: be48cfc8eb2f517563991b007c261fed58301fd1
Component: engine
 2016-08-11 18:35:21 -07:00
Madhu Venugopal
a67684d015 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>
Upstream-commit: 6645ff8ac1e6ff1c1a67b5d7d33b34dbdebf2924
Component: engine
 2016-08-11 00:12:43 -07:00
Tonis Tiigi
0130526e07 vendor: update swarmkit to cb6d8131 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3b555a575dfe9badbcd31fd8bc1f03fde746fe88
Component: engine
 2016-08-10 13:27:38 -07:00
unclejack
835bbac65d Merge pull request #25510 from justincormack/patricia-2.2.5 
Update go-patricia to 2.2.5
Upstream-commit: 34877a41a8a6660a31ff3770566cc1341759b16c
Component: engine
 2016-08-09 01:06:53 -07:00
Justin Cormack
936c3ba707 Merge pull request #25502 from LK4D4/update_gorilla 
vendor: use tags for gorilla projects
Upstream-commit: b2b41b2194a95c9f8b878b2a97706032fbf54c38
Component: engine
 2016-08-08 23:28:15 +01:00
Justin Cormack
21ddd17186 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>
Upstream-commit: e4402b285ba0a764ea1cffc1487c92b05b59a0ea
Component: engine
 2016-08-08 22:28:41 +01:00
Alexander Morozov
fc0f559a6c vendor: use tags for gorilla projects 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 98530ac8e2b0e1003f4d8346c5b1445b281d4f9c
Component: engine
 2016-08-08 11:58:32 -07:00
allencloud
b5cfc0f922 update go-units vendor to newest version 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: fc63bb83caea1baf4d3818b1c8c59f83e9db6f81
Component: engine
 2016-08-09 00:10:19 +08:00
Victor Vieux
d5f439ee89 Add --force to docker plugin remove 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0016b331dac94661678fd7676c7b6ccc9ec2d147
Component: engine
 2016-08-04 15:55:45 -07:00
Diogo Monica
0e5400a423 Add --force to node removal 
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
Upstream-commit: a327c231b5c68c13b7dcde2fdc83b8e4cec59c43
Component: engine
 2016-08-01 18:55:58 -07:00
unclejack
3da2c0af7c vendor.sh: bump go-patricia to 2.2.4 to fix leaks 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 3d714b5ed58cfdfd5872ddd3654d171b09bb02d3
Component: engine
 2016-08-01 12:21:19 +03:00
Madhu Venugopal
f9dff992a9 Vendoring libnetwork to avoid a deadlock 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
Upstream-commit: 61e59693dc3407ba1d68f8a5be17c117a96467e4
Component: engine
 2016-07-28 15:12:45 -07:00
Aaron Lehmann
555a24da1d 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)
Upstream-commit: 96b2a6e548bc3abf0f0a505ee020d2fe1e8997de
Component: engine
 2016-07-27 18:11:51 -07:00
Madhu Venugopal
62baa45d6c Vendoring libnetwork to fix #25109 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b1ae883d3f8c35f9142966af7bf5278e7a10b268
Component: engine
 2016-07-27 08:41:46 -07:00
Tibor Vass
688b7fe3c1 Merge pull request #25050 from aaronlehmann/vendor-swarmkit-rc5 
Vendor swarmkit for 1.12.0-rc5
Upstream-commit: 9fc2eee2b5b3c0cbc392a7ce6c085984871fb770
Component: engine
 2016-07-26 01:47:34 -07:00
Tibor Vass
154089229d Merge pull request #25042 from tiborvass/carry-24492 
Carry 24492: Remove swarm inspect and use info instead
Upstream-commit: 9ee430fcf5bd8e2afc6896bb2e0d12c1226c56c2
Component: engine
 2016-07-26 01:11:37 -07:00
Aaron Lehmann
633f464bc8 Vendor swarmkit for 1.12.0-rc5 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 60496af7118d91b04c4fd5a7e50150a76ad9abaf
Component: engine
 2016-07-26 00:45:07 -07:00
Vincent Demeester
eb900df556 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>
Upstream-commit: e6923f6d75c2bd1b22cc1229214ffceca3251cc6
Component: engine
 2016-07-25 20:31:10 -07:00
Tibor Vass
f2c5e83113 vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e3c150bd470162d7a1a168f125a5e9a3b32b6a00
Component: engine
 2016-07-25 20:31:10 -07:00
Madhu Venugopal
3d4bb9ff3f 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>
Upstream-commit: 6a754a4eef4463ed7c712a1ebe5bc38e2a957c42
Component: engine
 2016-07-25 19:44:07 -07:00
Tibor Vass
614fc25c93 Merge pull request #24943 from aaronlehmann/rolling-updates 
Add failure action for rolling updates
Upstream-commit: c65925f24baf98455c211b4eb5c408daaaefb07a
Component: engine
 2016-07-25 10:15:28 -07:00
Madhu Venugopal
439155a37c Vendoring libnetwork for rc5 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 56b78ab2f2871707ebdf33802a3029417b43036e
Component: engine
 2016-07-24 20:08:00 -07:00
Aaron Lehmann
f5ade81f8f Revendor engine-api 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3585026c3a01928a0e5a22e893af5f52c75e1a85
Component: engine
 2016-07-24 11:13:13 -07:00
Aaron Lehmann
766d8f186d Vendor libnetwork and github.com/vishvananda/netlink 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 24d2d53f5d3c3da8480f419618c1ae0b054f4cdc
Component: engine
 2016-07-24 09:22:36 -07:00
Aaron Lehmann
9d5822af82 Revendor swarmkit 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d626875a94d9066617887bcee5046c5f0bdcadab
Component: engine
 2016-07-24 09:22:32 -07:00
Sebastiaan van Stijn
aa4833cce5 bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9a3e47511ab9faac599b8f085a1b755ec941e49c
Component: engine
 2016-07-23 01:05:45 +02:00
Tibor Vass
79e3f2c256 Merge pull request #24823 from aaronlehmann/join-tokens 
Replace secrets with join tokens
Upstream-commit: f5e1f6f6880391a5a3399023cf93a3c48502e57d
Component: engine
 2016-07-21 18:06:55 -07:00
Aaron Lehmann
becf5d9875 Revendor swarmkit 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: aaa0f0b246c52ef3f5ae46b413f445028b7f88fe
Component: engine
 2016-07-21 15:23:03 -07:00
Aaron Lehmann
d1f36e2c60 Revendor engine-api 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 852091ad41127ba318ce1d382214ad2f6cab67de
Component: engine
 2016-07-21 15:23:03 -07:00
Alexandre Beslic
1cef852614 update libkv, fix wrong error check on zookeeper list 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
Upstream-commit: 5189e3d50d66c654132a64777e437dad55176ed5
Component: engine
 2016-07-20 17:25:39 -07:00
Sebastiaan van Stijn
7fe7aaea87 Merge pull request #24620 from yongtang/24270-service-list-filter 
Allow partial name match for service ls --filter, node ls --filter, node tasks --filter
Upstream-commit: 7d84c715005dd123b0a63f23b207c12cb998786f
Component: engine
 2016-07-20 21:25:06 +02:00
Yong Tang
095e5689c4 Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1 
This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1.

This is part of step to fix #24270.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 467107cd401ce9d3678e4f7ec1abfb65a0e46018
Component: engine
 2016-07-20 08:16:54 -07:00
Arnaud Porterie
257d1bc3de Merge pull request #24648 from mlaventure/fix-kill-test 
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
Upstream-commit: ffba13f43539ff58a0021c9353229507d50b66d5
Component: engine
 2016-07-19 18:24:34 +00:00
Kenfe-Mickael Laventure
7262ef8faa Vendor in new containerd 
This version introduces the following:
 - uses nanosecond timestamps for event
 - ensure events are sent once their effect is "live"

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 29b2714580d085533c29807fa337c2b7a302abb6
Component: engine
 2016-07-18 11:44:24 -07:00
Aaron Lehmann
6b6ea81208 Update vendored go-events 
This is needed to suppress a log message about a harmless condition
which was previously logged at the WARNING log level with potentially
high frequency (https://github.com/docker/go-events/pull/11).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: db9bc51cbeb40204ff15ea1a40db8d3736ad3845
Component: engine
 2016-07-18 10:38:27 -07:00
Sebastiaan van Stijn
158079c51b Merge pull request #24568 from dmcgowan/search-v2-auth 
Allow v1 search to use v2 auth with identity token
Upstream-commit: 56fb100140f96a010dcc834ed1d1626ffbc28970
Component: engine
 2016-07-14 19:11:33 +02:00
Daniel Nephin
e8f40d4fed Vendor go-shlex. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3464589c2aceb60972cdee14f57e0f41bcc8e327
Component: engine
 2016-07-13 12:20:50 -04:00
Alessandro Boch
04f3b7aca4 Vendoring libnetwork 905d374 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: cabc5b27c0d93a7665a24d205572a9462bb85da6
Component: engine
 2016-07-12 21:51:11 -07:00
Derek McGowan
c18a0faf47 Vendor distribution changes 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 1e0b7538fa2aba4aa252e423362171f1bbfa166c
Component: engine
 2016-07-12 17:36:57 -07:00
Madhu Venugopal
37b231e040 Vendoring libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 92c40f9bc0cd08dd8f8aaee6dd889b955a00dc60
Component: engine
 2016-07-12 11:27:32 -07:00
Tonis Tiigi
602a872e10 vendor: update swarmkit to 6478bc19 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4d12e64cd4893cbd9f7a6078851f4e3c9c6fd3a5
Component: engine
 2016-07-08 13:33:15 -07:00
Tibor Vass
e4b8c6fd9c Merge pull request #23312 from justincormack/proxy 
Make the docker proxy a standalone binary not a re-exec
Upstream-commit: 07dd69df8d6c5f4da0059d49e128fef9277fcb5d
Component: engine
 2016-07-07 17:14:40 -07:00
Justin Cormack
2ccfe96ba1 Update swarmkit vendoring 
Needed for libnetwork vendoring

Update Secret API name change correspondingly

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d428a7a425f071ee9e5707c7319d3197540adc19
Component: engine
 2016-07-07 21:01:54 +01:00
Justin Cormack
247801dadf Update libnetwork vendoring 
Update now that the changes in https://github.com/docker/libnetwork/pull/1230
have been merged

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3ae0c664507e0d8da5e3151f28b8d00316569e47
Component: engine
 2016-07-07 21:01:41 +01:00
Vincent Demeester
f5a13a7cbe Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
 2016-07-07 11:32:19 +02:00
Vincent Demeester
8322363100 Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6ec4a640de492e2f3c7b8268b5258d76b38b094b
Component: engine
 2016-07-07 11:32:09 +02:00
Brian Goff
a70c2240b7 re-vendor swarmkit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: db271b8833fc0b55998afababdaad60a67e3a982
Component: engine
 2016-07-06 21:14:14 -04:00