docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
26,376 Commits 12 Branches 296 Tags
15fecb0bf348d4c5c7deb8094de5e8b3900d0412
Commit Graph

544 Commits

Author SHA1 Message Date
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
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
04bb13f6d7 Merge service command and args as a string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 674d227445887ea2f9a0fde6ebb7838bcce58578
Component: engine
 2016-07-13 12:31:16 -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
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
Brian Goff
892399249d re-vendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
 2016-07-06 21:14:14 -04:00
Antonio Murdaca
4a48f9104a vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8aa37bdbb76a781d73c24800c2bc5373d2289c28
Component: engine
 2016-07-06 13:12:37 +02:00
Tibor Vass
33ecd21d8f Merge pull request #24230 from mlaventure/vendor-containerd 
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Upstream-commit: 93731a63502c7fa98b5276284ccd4907d418a793
Component: engine
 2016-07-01 13:26:28 -07:00
Kenfe-Mickael Laventure
84d90cb333 Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d
Component: engine
 2016-07-01 11:46:48 -07:00
Tonis Tiigi
a4340d91a9 Vendor updated swarmkit, libnetwork, engine-api 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 54255f53d8575d50aec4d58869240e01c41dad1b
Component: engine
 2016-06-30 17:21:39 -07:00
Nishant Totla
cddb6e635c Updating header name and executor 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
 2016-06-29 13:26:19 -07:00
Sebastiaan van Stijn
a556d4c8c6 Merge pull request #23950 from jstarks/no_clone_tp5 
Windows: Disable VM cloning for TP5 image
Upstream-commit: 1c06ebeeee1a600c0e4fc73d3c7485e5d15abfda
Component: engine
 2016-06-27 15:13:50 -07:00
Michael Crosby
e9a348a21b Update containerd to b93a33be39bc4ef0fb00bfcb79147 
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7db7e046315eed5ccfb3a913b965be4b1a595601
Component: engine
 2016-06-27 11:45:05 -07:00
John Starks
a78296b581 Revendor github.com/Microsoft/hcsshim 
Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: e6022251603b25b26ff70273fbb4474c8050fcf1
Component: engine
 2016-06-24 16:12:43 -07:00
Vincent Demeester
5c41618370 Merge pull request #23859 from aboch/vnd 
Update check-config.sh, netlink and libnetwork vendoring
Upstream-commit: 18398b2933577d9704e69b0b8312b495e487eeb5
Component: engine
 2016-06-23 20:34:02 +02:00
Alexander Morozov
ebb89af810 Merge pull request #23776 from Microsoft/ShutdownError 
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
 2016-06-22 12:11:00 -07:00
Alessandro Boch
0014a77b9b Vendoring libnetwork ed311d0 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e26c513fa818a57b4ea572121e153cf6f056e1ee
Component: engine
 2016-06-22 09:40:20 -07:00
Alessandro Boch
57899c6630 Vendoring vishvananda/netlink 734d02c 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0
Component: engine
 2016-06-22 09:37:17 -07:00