starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-10-20 04:41:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,020 Commits 14 Branches 328 Tags
eb900df55648a24995810c3dda9a6500994eda2d
Commit Graph
338 Commits
Author SHA1 Message Date
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
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
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
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
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 966b245d6f Update engine-api vendored version 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: e13a14340dde563fa799fb95090940c74636e398
Component: engine
 2016-06-28 13:53:01 -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
Jana Radhakrishnan dc5d595545 Vendoring @ab62dd6bf06bf0 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 663159e9acb93ea571e8aec0a687fcc16fd96dff
Component: engine
 2016-06-18 19:19:13 -07:00
Jana Radhakrishnan 467352d977 Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
 2016-06-17 19:01:18 -07:00
Jana Radhakrishnan 101ca2b440 Vendoring libnetwork @13be89d1cf79 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 70e2585d545e18757222b8ccfb21514fde7c42f4
Component: engine
 2016-06-17 10:27:34 -07:00
Arnaud Porterie 048ffaf8b1 Merge pull request #23643 from tonistiigi/membership 
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
 2016-06-17 01:40:06 +00:00
Arnaud Porterie cfbfd0a0b9 Merge pull request #23570 from vdemeester/change-plugin-install 
Update docker plugin install code…
Upstream-commit: 7ef9aec90f4f129945ab2f1e2c79b961a7af2209
Component: engine
 2016-06-17 00:12:56 +00:00
Michael Crosby 2eb1181d59 Merge pull request #23639 from mavenugo/ln-rc2 
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
Upstream-commit: eb6cc318023bea909fc72187b47a3cd6ff250e8e
Component: engine
 2016-06-16 16:17:07 -07:00
Vincent Demeester 8e11dc51d7 Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 58529a15535ee2accafdde740214c0d5b595d6e1
Component: engine
 2016-06-17 00:32:58 +02:00
Tonis Tiigi e47c5a4788 Update swarmkit to 310f1119 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2783568284a0c84bbb53df3c40295d27a151889e
Component: engine
 2016-06-16 15:06:27 -07:00
Madhu Venugopal c73117810f Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed 
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 7f2f6ed0d6f19bb6cedb6e59d410d0704636ce54
Component: engine
 2016-06-16 14:33:36 -07:00
Tõnis Tiigi 7b4f900246 Merge pull request #23606 from vieux/fix_secrets 
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
 2016-06-16 14:24:35 -07:00
Victor Vieux 9bd6973edb fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
 2016-06-15 17:05:10 -07:00
Michael Crosby 6a10bc5376 Update libnetwork to 96d45528599c32354230480a1ebc0 
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e927df7b4b58099113b5086371b1d80ff517f564
Component: engine
 2016-06-15 15:07:04 -07:00
Madhu Venugopal efcb8ab316 Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 5af8e2a9c08439049da9a9abc24145c3d1f2e9de
Component: engine
 2016-06-14 19:50:34 -07:00
Madhu Venugopal 241219195c Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: f2f97f768e51f817336cd56456158bc32ab3b977
Component: engine
 2016-06-14 19:50:34 -07:00
Arnaud Porterie 955da7c9c3 Merge pull request #23524 from aboch/restore 
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
 2016-06-15 02:33:16 +00:00
Arnaud Porterie 50a4204953 Merge pull request #23551 from tonistiigi/update-swarmkit 
Update swarmkit to 25572005f
Upstream-commit: 574f7d2149930749256d075e2f60614ea97c85ae
Component: engine
 2016-06-15 02:25:31 +00:00
Tonis Tiigi d1fb87c721 Update swarmkit to 25572005f 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: cdf279d74df05b2ce2a051fc5b53533ac5249f16
Component: engine
 2016-06-14 17:07:14 -07:00