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,109 Commits 12 Branches 296 Tags
c723d60fcd6d4959c4fbf1dfd2ace2cb8c77cc3b
Commit Graph

26109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff
c723d60fcd Merge pull request #25168 from miaoyq/optimize-a-print 
optimize a print in `volume/volume.go`
Upstream-commit: b09f28016166ea36f36916098ab18fd86a0eaa57
Component: engine
 2016-07-28 09:16:17 -04:00
Yanqiang Miao
57c5690493 optimize a print in 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update 'optimize-a-print'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: a503f3ac2fdb5f24b7ca982fc6447423095f229e
Component: engine
 2016-07-28 19:20:20 +08:00
Sebastiaan van Stijn
e1bdcf299e Merge pull request #25152 from thaJeztah/re-enable-api-1.25 
docs: re-enable API 1.25
Upstream-commit: 193b03615957e0aa41dbb5e675ab3530a501adb1
Component: engine
 2016-07-28 09:38:20 +02:00
Sebastiaan van Stijn
7fc346bc16 Merge pull request #25020 from jfrazelle/update-non-events 
update security non-events
Upstream-commit: 14664beda923dc9249cbd4ac4f024319668e57c0
Component: engine
 2016-07-28 09:29:51 +02:00
Sven Dowideit
2277dd5414 Merge pull request #25156 from londoncalling/docs-v112-getstarted-a 
modifed d4mac and d4win download links to stable for v1.12
Upstream-commit: 352c720d69f6c37c9b1e15332f46ea2dc4335cb9
Component: engine
 2016-07-28 17:08:54 +10:00
Victoria Bialas
77366c6416 modifed d4mac and d4win download links to stable for v1.12 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: ef528abcda1a4a7a1b605b57b56c5f3b630146bc
Component: engine
 2016-07-27 18:57:38 -07:00
Sebastiaan van Stijn
6a47f2d601 docs: re-enable API 1.25 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2b9838eafed6c9f56a47fecc997cdef9b0203e9a
Component: engine
 2016-07-28 02:11:34 +02:00
Jess Frazelle
c5246dacc1 update non-events 
Signed-off-by: Jess Frazelle <jessfraz@google.com>
Upstream-commit: 6837cfc13cba842186a7261aa9bbd3a8755fd11e
Component: engine
 2016-07-27 19:21:16 -04:00
Arnaud Porterie
bbee4a3aa4 Merge pull request #25013 from dnephin/remove-extraneous-aliases 
Remove extraneous mount cli aliases
Upstream-commit: 95ede360e8bd857a6fad2ff0ce08093bfcd6af09
Component: engine
 2016-07-27 22:51:56 +00:00
Sebastiaan van Stijn
ae11b0dc77 Merge pull request #24816 from stevvooe/service-ps-over-tasks 
cli: `docker service|node|stack ps` instead of tasks
Upstream-commit: 1a7d339d3698d13a4cf9592e8e73df27bf43664f
Component: engine
 2016-07-27 23:13:28 +02:00
Michael Crosby
3cd473134d Merge pull request #24760 from anusha-ragunathan/plugin-events 
Make daemon events listen for plugin lifecycle events.
Upstream-commit: 297745b1cdfb79a12986465f8150e22b0018c640
Component: engine
 2016-07-27 13:36:49 -07:00
Daniel Nephin
1cd561da3b Remove extraneous mount aliases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 39a3700c01142713e88ff954e86b5dc38174511b
Component: engine
 2016-07-27 15:05:31 -04:00
Tibor Vass
e696a8fadd Merge pull request #25131 from mavenugo/restoreln 
Vendoring libnetwork to fix #25109
Upstream-commit: b90f6d780a4b24bcd877505d177593dd5af8107d
Component: engine
 2016-07-27 11:09:27 -07:00
Stephen J Day
6a1ceaa1e1 cli: docker service|node|stack ps instead of tasks 
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0aa4e1e68973ede0c73f8a4356e2a17fc903f549
Component: engine
 2016-07-27 11:06:42 -07:00
Aaron Lehmann
bbe75712c3 Merge pull request #25010 from sfsmithcha/change_rolling_update 
update rolling update tutorial to reflect default parallelism
Upstream-commit: a861255ac2696ece63ef23c369685c0ec133e08c
Component: engine
 2016-07-27 10:13:16 -07:00
Charles Smith
6c0a8ccd7a update rolling update tutorial to reflect default parallelism and update on failure 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 6440cacd49226e97b2dcb64eb31cb32b87b1ff18
Component: engine
 2016-07-27 09:36:05 -07:00
Brian Goff
156db134e4 Merge pull request #25111 from coolljt0725/fix_25110 
Fix daemon panic on restoring containers
Upstream-commit: abf0e9f071c878ed33e84ca5c3cc1fc866f30652
Component: engine
 2016-07-27 11:43:45 -04: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
Sebastiaan van Stijn
cb9f5d85ea Merge pull request #25067 from lixiaobing10051267/masterBreak 
Add break after found = true
Upstream-commit: 2c947a4b009f90ce79abbdf137ea908320ab28ec
Component: engine
 2016-07-27 14:44:13 +02:00
Sven Dowideit
69eee2ec52 Merge pull request #25120 from thaJeztah/put-back-1.12-links 
Add back links to 1.12 release in deprecated.md
Upstream-commit: 296378d575f8111ba4a831c2d03baa21ed30582d
Component: engine
 2016-07-27 21:48:10 +10:00
Sven Dowideit
cb17293750 Merge pull request #25119 from thaJeztah/pre-1.12-ga-fixes 
Remove release-candidate advisories
Upstream-commit: 415ef83e02a11a086128d2247e09c72e22a09406
Component: engine
 2016-07-27 21:43:37 +10:00
Sebastiaan van Stijn
49967c7276 Merge pull request #25104 from cpuguy83/fix_TestApiSwarmRaftQuorum 
fix race in TestApiSwarmRaftQuorum
Upstream-commit: e07ff10f706a5bb9aa403c8d56876b09f9cba857
Component: engine
 2016-07-27 12:50:09 +02:00
Vincent Demeester
ce6c596db3 Merge pull request #25107 from stevvooe/cleanup-leader-election-test 
integration-cli: cleanup leader election tests
Upstream-commit: ef63637b995b07a08b6cb326dc8953b927e9df1d
Component: engine
 2016-07-27 12:47:33 +02:00
Vincent Demeester
619c13b7c9 Merge pull request #25057 from lixiaobing10051267/masterTestChtimes 
Modify func name from TestChtimes to TestChtimesLinux
Upstream-commit: 6857c0a040cc3aabadd0dbf2a1a517ddc3d02fc8
Component: engine
 2016-07-27 11:58:04 +02:00
Vincent Demeester
05b77e523d Merge pull request #25071 from yongtang/07252016-docs-bundlefile-example 
Add a bundlefile example in the documentation
Upstream-commit: 468ca5bb087a5bc91f5337450554a4692ed02329
Component: engine
 2016-07-27 11:56:38 +02:00
Vincent Demeester
4fdbca5a16 Merge pull request #25080 from crosbymichael/build-directive 
Move directive out of globals
Upstream-commit: ffd96a7c733983a14edbb72b8a8685b7fb0102b6
Component: engine
 2016-07-27 11:35:25 +02:00
Sebastiaan van Stijn
ef4baa67b4 Add back links to 1.12 release in deprecated.md 
These links were temporarily changed, because the
docs were published before the 1.12.0 tag was
available.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca
Component: engine
 2016-07-27 11:30:42 +02:00
Sebastiaan van Stijn
83871d9ca6 Merge pull request #25118 from thaJeztah/various-docs-fixes 
fix minor docs issues
Upstream-commit: fb7edde4f217eeb76291b9ae9b7eadbc0cb6aeaf
Component: engine
 2016-07-27 11:27:34 +02:00
Sebastiaan van Stijn
07a9303505 Remove release-candidate advisories 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 053ac127ab0f784bebeda38f29f2d7615d2ffcb8
Component: engine
 2016-07-27 11:24:16 +02:00
Sebastiaan van Stijn
669220f611 fix minor docs issues 
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break

also removes a duplicate redirect, that was present
on two pages

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d8434eba462752327d4c7769d3ce2c85013c211e
Component: engine
 2016-07-27 11:09:57 +02:00
Sebastiaan van Stijn
b404d167d7 Merge pull request #24970 from sfsmithcha/daemonless_containers 
add doc for live-restore setting and daemonless containers, fix admin…
Upstream-commit: d8c9fd0af9be3e937ec0520e0dcbe9a80eb321c4
Component: engine
 2016-07-27 11:00:15 +02:00
Sebastiaan van Stijn
b8668fb50c Merge pull request #24955 from sfsmithcha/add_how_services_work 
add how services work to how swarm mode works guide
Upstream-commit: 59e341667fdf24f8de7af7337dceea196d816457
Component: engine
 2016-07-27 10:59:08 +02:00
Lei Jitang
e4e65a85a5 Fix daemon panic on restoring containers 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c75de8e33cc0db5236eef6146f2de06533b46aa8
Component: engine
 2016-07-26 22:52:52 -04:00
Brian Goff
fbd6f3276f Merge pull request #25085 from aaronlehmann/restart-delay-integration-tests 
Specify a lower restart delay for swarm integration tests
Upstream-commit: 5d65ba4ca7ecaaa31f13cd3052ac7c052f09e21f
Component: engine
 2016-07-26 22:18:28 -04:00
Brian Goff
6a74120b2c Merge pull request #25084 from yongtang/25029-flaky-TestSwarmNodeTaskListFilter 
Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed
Upstream-commit: ebeee32b4e22fd86e2d27edbe3c7ab8a39e3a402
Component: engine
 2016-07-26 22:16:54 -04:00
Stephen J Day
9f01f14280 integration-cli: cleanup leader election tests 
Ensure convergence before moving on with testing leader election
conditions. This reduce the flakiness of this test when run in different
environments.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 946e23776be78510799f3f242f7b9f7acbbfd357
Component: engine
 2016-07-26 19:12:27 -07:00
lixiaobing10051267
e9800c4e43 Modify func name from TestChtimes to TestChtimesLinux 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Modify func note

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 1df9f0932e50ae497a6c79fc3a0ee85cb67f60d4
Component: engine
 2016-07-27 10:05:59 +08:00
Brian Goff
025360735d fix race in TestApiSwarmRaftQuorum 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4a856d7a87c65dd8c537a45443c72698f056cf13
Component: engine
 2016-07-26 21:32:56 -04:00
Brian Goff
0a12b515a3 Merge pull request #25086 from dmcgowan/overlay2-fix-sub-directory-whiteouts 
Fix overlay2 sub directory whiteouts
Upstream-commit: bb27d017f395d5683d0f82a203038c3055be91d8
Component: engine
 2016-07-26 20:45:41 -04:00
Alexander Morozov
774dbb0332 Merge pull request #25053 from AkihiroSuda/fixPluginPanic 
Fix pkg/plugins TLSConfig panic
Upstream-commit: 646f04799c031ee16e14103c893183a5b50d82db
Component: engine
 2016-07-26 16:49:49 -07:00
Michael Crosby
0a6571e2e9 Merge pull request #25094 from crosbymichael/remvoe-systemd-require 
Remove the Require on the socket for the rpm
Upstream-commit: 5c18c207cbb926fdcfc2e59b867fb902b4d0ab25
Component: engine
 2016-07-26 15:01:19 -07:00
Michael Crosby
08e3e00d23 Remove the Require on the socket for the rpm 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3cddda3bbb0cbc6f600b228b61e1110e0cf34c65
Component: engine
 2016-07-26 14:56:27 -07:00
Brian Goff
e1f945a9c5 Merge pull request #25083 from mapk0y/fix-doc-ipaddress 
fixes the ipaddress of the explanation.
Upstream-commit: 3b8ef038c10e0dbf624b44498d8832d0e189ed71
Component: engine
 2016-07-26 16:07:51 -04:00
Aaron Lehmann
2d9c640d4f Specify a lower restart delay for swarm integration tests 
If no restart delay is specified for a swarm service, the default
restart delay is 5 seconds. This is a reasonable value for actual
deployments - one example of where it's useful is that if a bad image is
specified, the orchestrator will wait 5 seconds between attempts to
restart it instead of restarting it in a tight loop.

In integration tests, this 5 second delay is dead time. The tests run
faster if the delay is reduced. Set it to 100 ms to avoid the waste of
time.

This appears to speed up a few tests:

DockerSwarmSuite.TestApiSwarmForceNewCluster 37.241s -> 34.323s
DockerSwarmSuite.TestApiSwarmRestartCluster  22.038s -> 15.545s
DockerSwarmSuite.TestApiSwarmServicesMultipleAgents 24.456s -> 19.853s
DockerSwarmSuite.TestApiSwarmServicesStateReporting 19.240s -> 10.049s

...a small step towards making the Swarm integration tests run in a
reasonable amount of time.

Also, change the update delay for the rolling update test from 8 seconds
to 4 seconds, which should be sufficient to differentiate between
batches of updated tasks. This reduces the runtime for
DockerSwarmSuite.TestApiSwarmServicesUpdate from 28s to 20s.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c93c6492589504ed9474922f7c98f9ecb24df77f
Component: engine
 2016-07-26 12:12:43 -07:00
Derek McGowan
5b655758f7 Fix files in subdirectories creating bad whiteout 
Closes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 1c0f6653ba82c933885719478e90c13f8d7e32b7
Component: engine
 2016-07-26 12:03:55 -07:00
Derek McGowan
8ab2988832 Update diff apply test to check sub directories 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5c05b8447d06793530e3d860b99a6e878685275a
Component: engine
 2016-07-26 12:03:55 -07:00
Yong Tang
1fe61aeefa Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed 
This is an attempt to fix the flaky test of TestSwarmNodeTaskListFilter in 25029.

Basically this fix adds a check to wait until 3 containers has already up,
before processing `node tasks ...`.

This might fix 25029.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 63c0366bc9a7f326ad61cdfa69fa860cf844a2c7
Component: engine
 2016-07-26 11:56:58 -07:00
Charles Smith
4695440d40 Merge pull request #25076 from sfsmithcha/add_manage_nodes_guide 
author merge: add swarm manage nodes guide
Upstream-commit: 08d1995fbf166cf5d6a0db5f37a11af8d28ee9f3
Component: engine
 2016-07-26 11:33:46 -07:00
mapk0y
3bf48fb858 fix the ipaddress of an explanation. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
Upstream-commit: a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25
Component: engine
 2016-07-27 03:17:32 +09:00
Anusha Ragunathan
062b507351 Make daemon events listen for plugin lifecycle events. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 42abccb841b5bc0d420044e69165852b0054c38f
Component: engine
 2016-07-26 10:51:47 -07:00