docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
29,776 Commits 12 Branches 297 Tags
8ef71fe7c8baca00bb567582df53ec7d9c3df0ae
Commit Graph

29776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda
8ef71fe7c8 Merge pull request #29391 from lixiaobing10051267/masterTypeWin 
fix some typos in libcontainer\types_windows.go
Upstream-commit: ec8b286dd347d8c71b2c62d3793d7276a6e2b16c
Component: engine
 2016-12-15 13:26:58 +09:00
Victor Vieux
9883fe32f2 Merge pull request #29413 from albers/completion-deploy-experimental 
Make bash completion for `docker stack deploy --bundle-file` available only in experimental mode
Upstream-commit: 9a30560fdaf1b86f58ae776d9578589752bbc5e5
Component: engine
 2016-12-14 17:24:50 -08:00
Tibor Vass
7ced24be6f Merge pull request #29156 from aaronlehmann/trusted-service-create 
Content trust for swarm services
Upstream-commit: ba368baea123dc5a852fcb7b3f1f1ab1e4ad26b6
Component: engine
 2016-12-14 16:04:50 -08:00
Phil Estes
e09abd9511 Merge pull request #29366 from unclejack/pkg_return_directly 
pkg: return directly without ifs where possible
Upstream-commit: 8415aeb39ae45e4414785f76ee63438ffc9517eb
Component: engine
 2016-12-14 21:20:26 +01:00
Anusha Ragunathan
3159d1f79d Merge pull request #29380 from vieux/skip_empty_network_plugin 
skip empty networks in plugin install
Upstream-commit: 738769d23cc69f3185931a1e71b387d0ca09d71d
Component: engine
 2016-12-14 11:53:42 -08:00
Aaron Lehmann
c5bc1e412f integration-cli: Add integration tests for swarm services + content trust 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 62cd3b39f901d14f984f1176ef0844918c145d21
Component: engine
 2016-12-14 10:50:23 -08:00
Aaron Lehmann
8bf34c7522 cli: Pin image to digest using content trust 
Implement notary-based digest lookup in the client when
DOCKER_CONTENT_TRUST=1.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d4d6f8c0d0c6cd0ba6dc96ab7a9ed07e1e766074
Component: engine
 2016-12-14 10:49:33 -08:00
Aaron Lehmann
87aafbf002 cli: Split out GetNotaryRepository and associated functions 
Split these into cli/trust so that other commands can make use of them.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4b8c79f25ee00ca5dfe22271c166938009bda976
Component: engine
 2016-12-14 10:49:32 -08:00
Kenfe-Mickaël Laventure
eaf703fbda Merge pull request #29387 from vicamo/add-debian-security-updates-when-available 
mkimage: add debian security updates source when available
Upstream-commit: b6f870a27816a90517f43b828d6a7d99303fe824
Component: engine
 2016-12-14 09:54:50 -08:00
Sebastiaan van Stijn
e2664ec347 Merge pull request #28943 from vdemeester/publish-long-short-syntax 
Remove --port and update --publish for services to support syntaxes
Upstream-commit: 2fe62f2395b966af7f38e442a91c75d042bb3b65
Component: engine
 2016-12-14 17:55:48 +01:00
Harald Albers
5a6d6a9103 Make bash completion for docker stack deploy --bundle-file experimental 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a53bdfa3be6a821b5093919c55f6995e1df35680
Component: engine
 2016-12-14 08:52:07 -08:00
You-Sheng Yang (楊有勝)
53db845317 mkimage: add debian security updates source when available 
Signed-off-by: You-Sheng Yang (楊有勝) <vicamo@gmail.com>
Upstream-commit: e2e5d4bc9da5ba17bb2822909611f8300fdd80f0
Component: engine
 2016-12-14 23:23:00 +08:00
Sebastiaan van Stijn
6abf315fff Merge pull request #29382 from yuexiao-wang/fix-wait-man 
Update the manual for docker wait
Upstream-commit: 2333af9e594560528419174fbd345265019c5e12
Component: engine
 2016-12-14 15:29:33 +01:00
Vincent Demeester
4734e1c8cf Merge pull request #29401 from bfirsh/add-swagger-display-name 
Add display name for tags in swagger.yaml
Upstream-commit: 1474a451b14fb164a20de7f64a07ab7c0e526a36
Component: engine
 2016-12-14 15:28:22 +01:00
Brian Goff
752649946b Merge pull request #29078 from bfirsh/add-swagger-docs 
Add make command for previewing API docs
Upstream-commit: c856c0c77752d347c52e4fb7386c53ff26c7db13
Component: engine
 2016-12-14 08:42:35 -05:00
Ben Firshman
e56158d95b Add make command for previewing API docs 
Much easier than the previous method of copying over to the docs
repository and generating the docs.

And, as @cpuguy83 pointed out, that actually didn't work
because the PR that adds Swagger docs isn't merged yet. Oopsy.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 27ca33e965b78df4d0e7be5597c2f48d9286775f
Component: engine
 2016-12-14 12:27:32 +00:00
Ben Firshman
7025bc9a7b Add display name for tags in swagger.yaml 
In #29071, we made the tags the correct name for generating types,
at the expense of the menu in the documentation looking good.

ReDoc now has support for tag display names
( https://github.com/Rebilly/ReDoc/pull/152 ), so we can assign
a more human-friendly name to the menu items.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 0caa6c218c89147b2d61a1bbb87c48ad16495a11
Component: engine
 2016-12-14 12:00:04 +00:00
yuexiao-wang
a3abb2b59e Update the manual for docker wait 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 303ff807f2690c1f572439bb5bc53a9ba89bf48f
Component: engine
 2016-12-14 18:22:59 +08:00
lixiaobing10051267
c493517769 fix some typos in libcontainer\types_windows.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: f385846d6ff48c17b7fc8173b8370df17c76ad40
Component: engine
 2016-12-14 16:33:03 +08:00
Tibor Vass
b35ecdcd72 Merge pull request #29374 from mavenugo/exp 
Add the missing experimental ipvlan network driver
Upstream-commit: 98fef1cb0b22b8dca2f88d637e01cf0a5df94798
Component: engine
 2016-12-13 20:03:24 -08:00
Tibor Vass
f541c344f4 Merge pull request #29008 from cpuguy83/refcount_graphdriver 
Refcount graphdriver plugins properly
Upstream-commit: af50cefe6cdf07e2028b9ad934a2cb5818a935eb
Component: engine
 2016-12-13 19:24:46 -08:00
Aaron Lehmann
269a50e61f Merge pull request #29198 from allencloud/return-no-swarm-when-unlock-normal-node 
return node is not a swarm when unlock a normal node
Upstream-commit: 96f7fedc1e9145f8fd6e8bb2f895fd22e95e6352
Component: engine
 2016-12-13 18:59:06 -08:00
Victor Vieux
126764baf1 skip empty networks in plugin install 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 04e35a01fcc7292272d688599ed23d829b85f46b
Component: engine
 2016-12-13 17:46:01 -08:00
Victor Vieux
e8408eec28 Merge pull request #29283 from cpuguy83/fix_plugin_live_restore 
Fix issues with plugin and `--live-restore`
Upstream-commit: e23c5fcdbb4f2b29aef3777c3709bc854a72b762
Component: engine
 2016-12-13 17:11:59 -08:00
Madhu Venugopal
9e9a89f944 Pass daemon experiemental flag to libnetwork 
Required to enable ipvlan experimental network driver

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b0eef4e427fc87826dd8abd59d09365abdfbedbb
Component: engine
 2016-12-13 14:22:54 -08:00
Madhu Venugopal
9125d5e539 Vendor libnetwork with experimental daemon flag handling 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8e6969d846830d7f56d7070956fba88e9c8848ed
Component: engine
 2016-12-13 14:22:48 -08:00
Brian Goff
2aa298ba4e Fix issues with plugin and --live-restore 
Fixes an issue when starting the daemon with live-restore
where previously it was not set, plugins are not running.

Fixes an issue when starting the daemon with live-restore, the plugin
client (for interacting with the plugins HTTP interface) is not set,
causing a panic when the plugin is called.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: cb6633175c0de0a7ae155c4d378cd2379681554b
Component: engine
 2016-12-13 16:11:59 -05:00
Vincent Demeester
cc92db8852 Merge pull request #29288 from Microsoft/jjh/promptusestdin 
Windows: Prompt fix use regular stdin
Upstream-commit: 5665c7364241e451a507a9e8024b6a8b43675527
Component: engine
 2016-12-13 21:18:54 +01:00
unclejack
f9eb0e420f pkg: return directly without ifs where possible 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 418e6123834def872edef06972c16d97b4cbc542
Component: engine
 2016-12-13 22:10:11 +02:00
Arnaud Porterie
25c6df8b2c Merge pull request #29349 from vdemeester/try-to-fix-win2lin 
Fix failures on Win2lin
Upstream-commit: 39473dad5425d734fdc73df0a678c6edc3d4054b
Component: engine
 2016-12-13 08:35:25 -08:00
Sebastiaan van Stijn
3e4fb722f6 Merge pull request #29361 from thaJeztah/update-service-ps-reference 
Update reference docs for service ps
Upstream-commit: 59a496e664544cb879190030b8af0d51c73bc8ce
Component: engine
 2016-12-13 16:59:37 +01:00
Vincent Demeester
6ccaba610c Merge pull request #29000 from yongtang/24352-swarm-update-no-flags 
Show usage when `docker swarm update` has no flags
Upstream-commit: cda04547c09c418dc0d5f99266757eeeb522f7bd
Component: engine
 2016-12-13 16:07:02 +01:00
Vincent Demeester
45956924f2 Merge pull request #29359 from yuexiao-wang/fix-network-option 
Fix the option name for network
Upstream-commit: 525c7bb9301a29964a8b9f977a469823cbd730fb
Component: engine
 2016-12-13 15:20:25 +01:00
yuexiao-wang
1a10407a76 Fix the incorrect option name 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b101e451f115840a05a6a6b412e06137f16fc64c
Component: engine
 2016-12-14 04:10:09 +08:00
Vincent Demeester
f5a62125bb Merge pull request #29346 from xlgao-zju/just-return-assignment 
Get rid of err altogether by just returning the assignment
Upstream-commit: 96ac223a1373848b1e5532af6a9887a2ede17de8
Component: engine
 2016-12-13 15:19:45 +01:00
Vincent Demeester
caf5d45bd8 Merge pull request #29335 from tophj-ibm/skip-plugin-test 
[integration-cli] skip plugin tests on non-x86
Upstream-commit: c2b7480604f6692ae0ef8a9b1763cd8e60f12fb5
Component: engine
 2016-12-13 14:54:41 +01:00
Yong Tang
9c84f95c6e Show usage when docker swarm update has no flags 
This fix tries to address the issue raised in 24352. Previously,
when `docker swarm update` has no flags, the output is
```
Swarm updated.
```
even though nothing was updated. This could be misleading for
users.

This fix tries to address the issue by adding a `PreRunE` function
in the command so that in case no flag is provided (`cmd.Flags().NFlag() == 0`),
the usage will be outputed instead.

An integration has been added to cover the changes.

This fix fixes 24352.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 5aa5a1cb008963ee6a99011b8f7cd1f489e2bc6a
Component: engine
 2016-12-13 05:05:04 -08:00
Sebastiaan van Stijn
30be95cf13 Update reference docs for service ps 
commit bbd2018ee19eff5594ae3986bf56fbcd0044699d
changed the output format of `docker service ps`.

this patch updates the reference docs
to match the updated output format.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5902fa33840507706e6e9b189fec0adeb20affa5
Component: engine
 2016-12-13 13:30:58 +01:00
Vincent Demeester
252ac47c97 Merge pull request #29216 from allencloud/add-status-code-403-for-services-create 
add missing status code 403 for services/create in docs
Upstream-commit: 1bc942597d4a4cfb16493f416eb1c4c36029819b
Component: engine
 2016-12-13 12:27:56 +01:00
Vincent Demeester
5503d01466 Merge pull request #29348 from lixiaobing10051267/masterMount 
modify some wrong func information in device_tool.go
Upstream-commit: ce9960a9b20cbad3a811c42fbb848ddb95be0446
Component: engine
 2016-12-13 12:23:43 +01:00
Vincent Demeester
d919d08498 Merge pull request #29352 from lixiaobing10051267/masterStack 
stack_config.md not exist and delete it in other files
Upstream-commit: 3b9646b4a43ed389626ce1ac0ba40321804aa0e0
Component: engine
 2016-12-13 12:18:13 +01:00
Vincent Demeester
cc3da24d75 Fixing win2lin builds by adding a testRequires to DockerDaemonSuite 
The success of the win2lin CI before was really "by chance" on the
DockerDaemonSuite : the DockerDaemonSuite was panicking when starting
the daemon on the first non-skipped test.The suite panicked but as
the error returned from `StartWithBusybox` was nil, the test kept
going and was OK because the client had all the correct environment
variables set up to discuss with the remote daemon.

Then, as the suite panicked, no more test attached on the
DockerDaemonSuite ran (that's why on win2lin, `DockerDaemonSuite` was
only composed by 5 tests !). The really bad thing is, we didn't get
any report of the panic on the suite (go-check hiding something
somewhere).

As DockerDaemonSuite needs to run test on the same host as it's
running, this adds a `SameHostDaemon` requirement to the Suite.

This changes also make sure `TestRestartContainerWithRestartPolicy`
does left weirdies behind it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e857785df4b53df551ad25d132bc0274923f2e53
Component: engine
 2016-12-13 12:04:53 +01:00
lixiaobing10051267
1bef3cf8f2 stack_config.md not exist and delete it 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: afaff51a8b59630f880493679906acc3acc3005a
Component: engine
 2016-12-13 18:06:18 +08:00
lixiaobing10051267
925c1d5b69 modify some wrong func information in device_tool.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: cde57a0d56a034975c5a6f4e07d807b8ce66f331
Component: engine
 2016-12-13 17:49:03 +08:00
Vincent Demeester
d26a2271f7 Merge pull request #28437 from thaJeztah/deprecate-default-network-inspect 
deprecate "top-level" network information in NetworkSettings
Upstream-commit: 7f44e09797351d5a62eb044d1832bab9a40c1b98
Component: engine
 2016-12-13 08:58:57 +01:00
Vincent Demeester
90bc3ba4b5 Merge pull request #29267 from yuexiao-wang/fix-bulid-para 
Update the option for docker build
Upstream-commit: 3d52c86d4c8405372445502b2592e8f63132ce99
Component: engine
 2016-12-13 08:55:20 +01:00
yuexiao-wang
d619a55e45 Update the option 'network' for docker build 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: cd317282c9b7d4dc68dce8df1d2f84e7a5654e72
Component: engine
 2016-12-13 18:18:53 +08:00
Xianglin Gao
d0d8fac761 Get rid of err altogether by just returning the assignment 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
Upstream-commit: da5d3cccc43a9ee51c8b37c751cfbc2a4e16e9ee
Component: engine
 2016-12-13 14:25:57 +08:00
allencloud
0bc3e1033e return not a swarm when unlock 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0270645c13647456834d86082470734e944fdd37
Component: engine
 2016-12-13 10:38:45 +08:00
Victor Vieux
d4e814fc0e Merge pull request #29337 from anusha-ragunathan/unmount_enable_err 
When plugin enable fails, unmount PropagatedMount.
Upstream-commit: e9076c0f00898e7af05e667d65ecb84a6e15d9c8
Component: engine
 2016-12-12 16:02:16 -08:00