3715fc37cc
Merge pull request #28386 from sdurrheimer/zsh-completion-service-secret
...
Add zsh completion for 'docker service {create,update} --secret'
Upstream-commit: b661338d87e219136ce467df49b2a1247a8742d4
Component: engine
2016-11-14 15:23:03 +01:00
1972d4f850
Merge pull request #28365 from wefine/fix-t-errorf
...
fix t.Errorf to t.Error in serveral _test.go
Upstream-commit: 21051de6e1ba928a08baff505a7d89532b6133eb
Component: engine
2016-11-14 14:46:30 +01:00
ae0437f374
Add zsh completion for 'docker service {create,update} --secret'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 0bc07d29577bf163eb88c4047e52382218dd4026
Component: engine
2016-11-14 13:38:48 +01:00
516defc10d
Merge pull request #28344 from albers/completion-service--ports
...
Add bash completion for managing ports in services
Upstream-commit: e129365fd371eba3fcf3d8e64bb1a12a297d0323
Component: engine
2016-11-14 12:40:36 +01:00
12f5dc9d03
Merge pull request #28381 from sdurrheimer/zsh-completion-secret-command
...
Add zsh completion for the new 'docker secret' command
Upstream-commit: 7ee0c3c9f81cd87e61ecf199eeca0b60bda0c3aa
Component: engine
2016-11-14 12:14:25 +01:00
7a9630020f
fix t.Errorf to t.Error in serveral _test.go
...
Signed-off-by: wefine <wang.xiaoren@zte.com.cn >
Upstream-commit: f78f7de96aebee64b55bb9955fa6c97be2c59662
Component: engine
2016-11-14 17:54:43 +08:00
3e5a34af4b
Merge pull request #28203 from shaynewang/27687-fix-tail-flag-returning-more-lines
...
Fixes #27687 docker logs --tails returns less lines than expected
Upstream-commit: 28094357ed3f7238e533b870a4e24676c6102f2e
Component: engine
2016-11-14 10:17:38 +01:00
afb911f1fd
Add zsh completion for 'docker service' DNS settings
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 54ebf4f74a5e8f6598849da4a9052743ada8e83f
Component: engine
2016-11-14 09:45:27 +01:00
2169a7a10e
Merge pull request #28369 from yongtang/11132016-completion-dns-option
...
Update bash completion `dns-options-add/rm` -> `dns-option-add/rm`
Upstream-commit: e7769e29e00394ccac3d1eabb0efff92864c30da
Component: engine
2016-11-14 16:39:28 +09:00
f7b1bf984c
Add zsh completion for the new 'docker secret' command
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b184bdabf7a01c4b802304ac64ac133743c484be
Component: engine
2016-11-14 08:24:19 +01:00
534b21da59
Add zsh completion for 'docker image build --network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 11bfa638fe5b5fecf16341d4d7154c233862d946
Component: engine
2016-11-14 08:22:09 +01:00
f67a1e9e2b
Remove duplicated document
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 5527202e41dfa48b8635dd6f274acb7f19ee3302
Component: engine
2016-11-14 14:43:00 +08:00
c22557cc46
Change reading order of tailfile
...
change reading order from beginning at the end to beginning at a buffer start
added intergration tests for boundary cases
Removed whitespace
Signed-off-by: Shayne Wang <shaynexwang@gmail.com >
Upstream-commit: 63904eb6745d553573ffe8b7cef43dfc0b8a07cf
Component: engine
2016-11-13 20:08:51 -08:00
527e874e41
Fix a small typo in docs/deprecated.md
...
A small typo in `docs/deprecated.md`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 45e5b2552ab1ca685e88e0feeedc92fb817d8567
Component: engine
2016-11-13 20:04:25 -08:00
8a0323e12b
Update bash completion dns-options-add/rm -> dns-option-add/rm
...
In 28186, `dns-options-add/rm` has been changed to `dns-option-add/rm`
in `docker service create/update`, for the purpose of consistency.
This fix updates bash completion to remove extra `s`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: fb8404a3488bccfb4b318d279332946f370d1452
Component: engine
2016-11-13 19:12:01 -08:00
9e9974619f
Fix a comment error
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 19e2c9177a111758e304ad9dbd0835cddbd840ab
Component: engine
2016-11-14 09:55:27 +08:00
a107ce5f56
Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
...
judge manager before getting secret
Upstream-commit: 0f20d6f5ab24e5b05bd49165ecc11e9bafaf6833
Component: engine
2016-11-13 22:19:07 +01:00
e8319d6f50
Merge pull request #28362 from albers/completion-service-dns
...
Add bash completion for DNS settings in services
Upstream-commit: f39cb08209ceffcb3363ab1f46007f11cb287211
Component: engine
2016-11-14 05:42:24 +09:00
829db7abcd
Merge pull request #28360 from albers/completion-service-ps--all
...
Add bash completion for `docker service ps --all`
Upstream-commit: e649cc147630746b1e98424933ee457d3f0c7f46
Component: engine
2016-11-13 21:39:07 +01:00
560a7b97d2
Merge pull request #28357 from sdurrheimer/zsh-completion-service-ports
...
Add zsh completion for 'docker service {create --port, update --port-…
Upstream-commit: f1dd4c5ad8fbbe8cb977389d042879a6960f9605
Component: engine
2016-11-13 21:38:17 +01:00
22c20a57de
Merge pull request #28355 from sdurrheimer/zsh-completion-build-cache-from
...
Add zsh completion for 'docker image build --cache-from'
Upstream-commit: bf2c875cd60df4e7f2fcf28bd56b54dfd67e878e
Component: engine
2016-11-13 21:37:10 +01:00
dfc6729ba9
Merge pull request #28342 from albers/completion-build--cache-from
...
Add bash completion for `docker build --cache-from`
Upstream-commit: 7220888b0988d4ddfc5fea783420e2dd4b26ff00
Component: engine
2016-11-13 21:34:55 +01:00
e7777cd3a6
Merge pull request #28310 from mlaventure/docker-info-update
...
Docker info binaries version update
Upstream-commit: 1e673b9876ab4a12e7718424db9484fca6f516b3
Component: engine
2016-11-13 21:24:51 +01:00
d74191c744
Add bash completion for DNS settings in services
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 28dc8c863a810a5fce078319fb422caced67b725
Component: engine
2016-11-13 11:17:18 -08:00
6be217cc5f
Add bash completion for docker service ps --all
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 188d2fac57d63888f08531adc46aa3349e3b4f3a
Component: engine
2016-11-13 09:32:53 -08:00
0e5766bf8a
Merge pull request #28359 from allencloud/fix-typo-in-node-update-docs
...
fix typo in node update docs
Upstream-commit: 3be885cd892ef5dc80318953244695f8f7df78a9
Component: engine
2016-11-13 10:41:09 -06:00
a1ee221aad
fix typo in node update docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7bbbc8c7f16869dbb43e4e218ac280d5d1c0944a
Component: engine
2016-11-14 00:07:52 +08:00
64bd3d84d9
Add zsh completion for 'docker service {create --port, update --port-{add,rm}}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 36916ae2ad3709ec254d6c013fb5712820a898a7
Component: engine
2016-11-13 14:21:13 +01:00
2116574cfe
Add bash completion for managing ports in services
...
Bash completion for
- `docker service create --port`
- `docker service update --port-{add,rm}`
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 279bd827fe3393b1790ef26e36a3a7f4260c0441
Component: engine
2016-11-13 04:57:37 -08:00
9a718bf5f4
Fix bash completion for docker ps --filter is-task
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7b6a38e1b1e146e4350db0e38d3d7a9313232ece
Component: engine
2016-11-13 04:54:54 -08:00
b84e37a24c
Add zsh completion for 'docker image build --cache-from'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ac50074258c0fef31ddc5c062ac5c07379b7cf78
Component: engine
2016-11-13 13:52:52 +01:00
ac2f27add0
judge manager before getting secret
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 1addb4817bca8daeb3a3bca207705ad72f5c7a16
Component: engine
2016-11-13 12:52:09 +08:00
983c12d757
Update docs for docker info for most recent changes.
...
This fix updates docs for `docker info` for most recent changes.
It also made several chagnes:
1. Replace 0.12.0-dev to 0.13.0 for api docs v1.24.
2. Replace 0.13.0-dev to 0.13.0 for api docs v1.25
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: d7257640835abe5e7c08235b3fd974e319dbd7b6
Component: engine
2016-11-12 17:30:53 -08:00
da285acf1e
Fix missing versions in example requests of api docs
...
It is not required to have version prefix for all the remote
APIs. Though there are still quite a few example requests
in api docs that does not have the version prefix.
This fix update the remote api docs to address this issue.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9dabde5b01c50cbac3da20943ba3c4498a7516c4
Component: engine
2016-11-12 13:12:02 -08:00
f8098bf244
Add bash completion for docker build --network
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d48e70843f2ea26c60b42165edbc9be8ace0d2d5
Component: engine
2016-11-12 10:32:08 -08:00
f3c74eec0d
Add bash completion for docker build --cache-from
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c6357f04b5f30ac4d0e6712a05375013a8f7327e
Component: engine
2016-11-12 10:12:47 -08:00
5ebd7571b1
Fix issue with missing fields for ps template
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b4ab4530841417305bcaa0b0d25d172bfbf3956a
Component: engine
2016-11-12 11:23:21 -05:00
89b8c035b8
Merge pull request #28317 from tonistiigi/amd64-plugin-tests
...
Skip plugin tests if not in amd64
Upstream-commit: c8492ebc5db4fafb77bd1c8a0bcdf20f64597f3d
Component: engine
2016-11-12 13:52:42 +01:00
b5ceeb760a
Merge pull request #28333 from chchliang/wordcode
...
`dont` spell error
Upstream-commit: 48339156448f3611b455a80098754163aa034e9e
Component: engine
2016-11-12 13:51:53 +01:00
2967986572
don't spell error
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: 167f2f3f1bb4cf80abe1fbb4a090179a850363e3
Component: engine
2016-11-12 14:57:37 +08:00
70633c7349
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: aff5dacec190e8d94c6b796b06c773c8b1b223fe
Component: engine
2016-11-12 14:14:34 +08:00
37bec9cc07
cli: Add valid suffixes for remaining duration options
...
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 32b12a28fcab98b79c9176fb78b5620a46906916
Component: engine
2016-11-11 17:44:42 -08:00
aac63267fa
Show experimental flags and subcommands if enabled
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: d67aa065ef9f295949ed507fc3d67f29fd56fcdb
Component: engine
2016-11-11 17:43:06 -08:00
aa871fbd88
Planned 1.13 deprecation: email from login
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a66efbddb8eaa837cf42aae20b76c08274271dcf
Component: engine
2016-11-11 17:32:46 -08:00
d9c6d7e1df
Merge pull request #28309 from LK4D4/fix_non_autogen
...
dockerversion: add other binaries to _lib.go
Upstream-commit: 851d9149b1e9d67811b227ed7cdf1fc6734ccdda
Component: engine
2016-11-11 15:39:00 -08:00
f7da4775d2
Merge pull request #28323 from Microsoft/jjh/typoinremoteapi1.25
...
Extra v1.25 in API docs
Upstream-commit: c03900ab3055b9d4868f5bdd61f062678b1eecde
Component: engine
2016-11-11 16:39:18 -05:00
6ad57bc63a
Extra v1.25 in API docs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: beccd3663f3e377249fa5c07f62cbdbe5f3be14a
Component: engine
2016-11-11 12:50:05 -08:00
38fe0f3c76
Merge pull request #28306 from ehazlett/service-create-no-secrets
...
only check secrets for service create if requested
Upstream-commit: 744d9dac10f3fb1ddbb54f6bea1cf9380e05891b
Component: engine
2016-11-11 20:58:40 +01:00
e5cb7de38d
Skip plugin tests if not in amd64
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e23e36f25cc55fd273fa04f2dd9d3772683ee381
Component: engine
2016-11-11 09:52:13 -08:00
e9d1cb1940
Merge pull request #28042 from yongtang/28018-docker-info-swarm-managers
...
Add information for `Manager Addresses` in the output of `docker info`
Upstream-commit: 6f3720ca9e5e18cb0f6c36f89137cc294e2398b7
Component: engine
2016-11-11 09:30:01 -08:00
