c4e7f016d4
Merge pull request #29468 from hongbin/volume-plugin-fuxi
...
Add Fuxi Volume Plugin to the docs
Upstream-commit: 13f45768f037d77da50317c338c32512e137c92c
Component: engine
2016-12-21 21:49:28 +01:00
4313743ab7
Merge pull request #29212 from yongtang/29185-docker-inspect
...
Fix `docker plugin inspect <unkown object>` issue on Windows
Upstream-commit: e91604c0d2d15cacd06e911cab360291a79e5f37
Component: engine
2016-12-21 15:47:17 -05:00
41c71150d4
Merge pull request #28594 from Microsoft/jjh/fixtodo
...
Windows: Fix a longstanding TODO
Upstream-commit: b567e8777d585819bad7513e7d219f9c837825bf
Component: engine
2016-12-21 15:46:00 -05:00
60c04ae8d4
Merge pull request #28714 from thaJeztah/move-logdriver-check-to-daemon
...
move check for supported drivers to daemon
Upstream-commit: 267d6935c5dcb806d24df8dd78d3d053773f8c19
Component: engine
2016-12-21 13:47:30 -05:00
8cd1e5171c
Merge pull request #28888 from endophage/notary0.5.0
...
updating notary to released 0.5.0 version
Upstream-commit: aa188634cc7aea737bda67b5299b2778265c79c0
Component: engine
2016-12-21 13:44:18 -05:00
85d3bbdc8b
Merge pull request #28900 from tophj-ibm/ppc64le-rpmbuild-fedora23
...
[ppc64le] add make rpm for fedora 24
Upstream-commit: 7548fc763789979b86b907a3d12f6f5b7c85c802
Component: engine
2016-12-21 13:43:13 -05:00
a72ca85c0c
Merge pull request #29491 from yongtang/12162016-stats-error
...
Improve error output for `docker stats ...`
Upstream-commit: d65d5db2a0351f07060f02c2d2466a12c1cfcd89
Component: engine
2016-12-21 13:19:20 -05:00
97f0ab72fa
Merge pull request #29527 from allencloud/change-minor-mistake
...
change minor mistake of spelling
Upstream-commit: b2e348f2a6ab2d5396acf4bb56aea7e49c3e2097
Component: engine
2016-12-21 13:15:00 -05:00
a0007159e8
Merge pull request #29577 from lixiaobing10051267/masterDevice
...
several function names fixed in devmapper.go
Upstream-commit: de92e2fa7419e2aaba1b07c1085cb576df049bf7
Component: engine
2016-12-21 12:21:22 -05:00
1173e9c692
Merge pull request #29637 from wxb0521/bo-docker-0.5
...
some punctuation errors and a verb form error
Upstream-commit: 584485abca124d45e08b618e23b7cbf7b947895f
Component: engine
2016-12-21 12:18:04 -05:00
543d068f5f
Merge pull request #29633 from qar/fix/docs
...
Fix document typos
Upstream-commit: fbc1f1a40c58a26ec75763c47474cb0757b3c3a5
Component: engine
2016-12-21 12:17:29 -05:00
bf156b7063
Merge pull request #29623 from luojie233/branch3
...
duplicated "the"
Upstream-commit: 7a94c6974fd8a6efeee588f074b44e445c0bfa85
Component: engine
2016-12-21 11:33:34 -05:00
5f8f7eaafe
update service update in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b44efead25a1d2600f0950e5e2800c17e7489a43
Component: engine
2016-12-22 00:11:08 +08:00
d9da185a1c
Add warning on docker group suggestion
...
Signed-off-by: Eric Curtin <ericcurtin17@gmail.com >
Upstream-commit: 5b4a528b579c7a3582e0c0f707638f3ccf5969ad
Component: engine
2016-12-21 15:02:50 +00:00
762f59b700
Merge pull request #29611 from johnstep/ps-make-dco
...
Fix regular expression for PowerShell DCO check
Upstream-commit: 2d1b578e671778a115e84d3c539db952ae4954ae
Component: engine
2016-12-21 13:36:33 +01:00
44fa4f8ae7
duplicated the
...
Signed-off-by: Jie Luo <luo612@zju.edu.cn >
typo
Signed-off-by: Jie Luo <luo612@zju.edu.cn >
fix some typos
Signed-off-by: Jie Luo <luo612@zju.edu.cn >
Upstream-commit: ea2dd4b5d0b41552d047814d9e39ddaa3662ab41
Component: engine
2016-12-21 20:16:19 +08:00
b238e8e00f
some punctuation errors and a verb form error
...
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn >
Upstream-commit: 32996d6016a9f109a44301279d52d881651790e9
Component: engine
2016-12-21 20:05:19 +08:00
a71c5dded1
Remove unused var 'errTLSConfigUnavailable' ( #29626 )
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 1ea0be9dbca79efc239a49a802189f2b6d5ae7c0
Component: engine
2016-12-21 06:41:14 -05:00
c2a452db81
Fix document typos
...
Change the `State` field of the `/containers/json` remote API response to lowercase.
This change involves docs/api/v1.23.md and docs/api/v1.24.md
Signed-off-by: Anran Qiao <anran.qiao@daocloud.io >
Upstream-commit: 3dc3921c76a2d21c652ec867e42e9bbe095d91da
Component: engine
2016-12-21 18:28:52 +08:00
dd179255a2
Fix docker plugin inspect <unkown object> issue on Windows
...
This fix is a follow up for comment:
https://github.com/docker/docker/pull/29186/files#r91277345
While #29186 addresses the issue of `docker inspect <unknown object>`
on Windows, it actually makes `docker plugin inspect <unknown object>`
out `object not found` on Windows as well. This is actually misleading
as plugin is not supported on Windows.
This fix reverted the change in #29186 while at the same time,
checks `not supported` in `docker inspect <unknown object>` so that
- `docker plugin inspect <unknown object>` returns `not supported` on Windows
- `docker inspect <unknown object>` returns `not found` on Windows
This fix is related to #29186 and #29185 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0b3c10ac4ddfe3655bac080440a8553269f2307f
Component: engine
2016-12-20 21:05:10 -08:00
59c54dda91
several function names fixed in devmapper.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: f93b41e9261f96d4f3b2337f1ff419de42871489
Component: engine
2016-12-21 10:45:28 +08:00
6aa55086ca
Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win
...
updates to glossary re: d4mac, d4win, toolbox per user request
Upstream-commit: fb41283e493ab5d9c083433cdffdf2fba4019ecb
Component: engine
2016-12-21 02:16:28 +01:00
4c53abe848
Clarify what docker diff shows
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 4497801c8a35ca2be9467419c5addff5166442d0
Component: engine
2016-12-20 17:03:11 -08:00
9e120272c4
Fix regular expression for PowerShell DCO check
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 0ce6c12f88b556cf1eabd2f809c2b23cbea229c7
Component: engine
2016-12-20 15:32:39 -08:00
b979364e01
Improve bash completion for bundled plugins
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9ca56f7683ae05ce9fd84a8606329c4c00269cd7
Component: engine
2016-12-20 13:28:46 -08:00
4fb828cd66
Refactor cleanup of paused test containers
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 788c20668d8c965336f5d174cab4747187d53940
Component: engine
2016-12-20 16:26:55 -05:00
67834a4b9f
Merge pull request #29470 from cyli/ask-for-unlock-key-only-if-locked
...
Check if a swarm is locked before asking a user to enter their unlock key
Upstream-commit: 0d5a715931c514dd9fdc77927105bdf049411b2b
Component: engine
2016-12-20 13:21:47 -08:00
d224f4ec28
Merge pull request #29450 from yongtang/29291-no-default-replicas-output
...
Fix misleading defaults for service create/update
Upstream-commit: b1cb8979987c5a7ba4b8a30f0ba5147d76671c01
Component: engine
2016-12-20 17:11:05 +01:00
35814260ea
Merge pull request #29583 from liliVicky/my-feature2
...
correct some words
Upstream-commit: e6d06a5271cd176b38aac02d97163e65ece500a9
Component: engine
2016-12-20 15:37:59 +01:00
92139ffe94
Merge pull request #29589 from lixiaobing10051267/masterDockerPs
...
field NAMES ommitted after docker ps in commit.md
Upstream-commit: 9eb9abea6d22e795298871500df061ec7e9644f6
Component: engine
2016-12-20 09:27:13 -05:00
e877ead08e
Merge pull request #29550 from LK4D4/fix_commit
...
commit: do not change container labels on commit
Upstream-commit: dc8a6d91fb154c96a34ea5e850b25f5c2e88fe19
Component: engine
2016-12-20 09:25:09 -05:00
b5e0f7eb0f
Change tls to TLS
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 113cae5ba2a0edadadbdf8aea06a52ab6b5f0361
Component: engine
2016-12-20 22:08:07 +08:00
209ed6b4ef
change minor mistake of spelling
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7c3657065cc04af278a0f1cee99de8c2401ba0ef
Component: engine
2016-12-20 21:05:19 +08:00
3f00f70bbf
field NAMES ommitted after docker ps in commit.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: f34ccd70c8c55946fe9d3b83b44bdac770858176
Component: engine
2016-12-20 20:34:09 +08:00
5c41fff748
Merge pull request #29569 from allencloud/update-docs-about-oom-score-adj
...
update docs about --oom-score-adj
Upstream-commit: 0d93970c527b7bbe970655ada658f3c7466d015a
Component: engine
2016-12-20 13:18:57 +01:00
d71866a5fc
Fix incorrect info and format of error in image
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b2ec509a3f9e50980fe3733500df56289c174252
Component: engine
2016-12-20 18:20:15 +08:00
ecbc8d61e5
Add the link for swarm reference document
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: ee23a8e124ef4801bcd0d044578da8daf63cba6f
Component: engine
2016-12-20 18:09:21 +08:00
420207ba8c
correct some words
...
Signed-off-by: liwenqi <vikilwq@zju.edu.cn >
Update ISSUE-TRIAGE.md
Signed-off-by: vicky <395658237@qq.com >
Upstream-commit: b506f8ecdd5ca8adb5d8ad77f085283ee5f584d6
Component: engine
2016-12-20 17:43:26 +08:00
96f73955fb
Fix misleading default for --replicas
...
This fix tries to address the issue raised in 29291 where
the output of `--replicas` in `service create/update`:
```
--replicas uint Number of tasks (default none)
```
is misleading. User might incorrectly assume the number of replicas
would be `0` (`none`) by default, while the actual default is `1`.
The issue comes from the fact that some of the default values are
from daemon and it is not possible for client to find out the default
value.
In this case, it might be better to just simply not displaying `(default none)`.
This fix returns "" for `Uint64Opt` so that `(default none)` is hidden.
In addition to `--replicas`, this fix also changes
`--restart-delay`, `--restart-max-attempts`, `--stop-grace-period`,
`--health-interval`, `--health-timeout`, and `--restart-window`
in a similiar fashion.
New Output:
```
--health-interval duration Time between running the check (ns|us|ms|s|m|h)
--health-timeout duration Maximum time to allow one check to run (ns|us|ms|s|m|h)
...
--replicas uint Number of tasks
...
--restart-delay duration Delay between restart attempts (ns|us|ms|s|m|h)
--restart-max-attempts uint Maximum number of restarts before giving up
--restart-window duration Window used to evaluate the restart policy (ns|us|ms|s|m|h)
...
--stop-grace-period duration Time to wait before force killing a container (ns|us|ms|s|m|h)
```
The docs has been updated. Note the docs for help output of `service create/update`
is out of sync with the current master. This fix replace with the update-to-date
help output.
This fix fixes 29291.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: acc93db32bd0d14801db65d6cb0a0e06d7cec2f7
Component: engine
2016-12-19 19:35:05 -08:00
1ab863db0a
Merge pull request #29525 from lixiaobing10051267/masterDiff
...
Use wrong ApplyLayer in diff_windows.go
Upstream-commit: 2cf32ee04360add15b4431ba55032824ac089349
Component: engine
2016-12-20 12:32:54 +09:00
44e172af71
There should be plural ( #29571 )
...
Signed-off-by: lyn <energylyn@zju.edu.cn >
Upstream-commit: d1561620a756e5fb98d6683af7089fe36a9639de
Component: engine
2016-12-19 22:31:07 -05:00
e32e0ddf32
update docs about --oom-score-adj
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: bb85d483b7cc53ad36d062f624f36ac58e2c9b40
Component: engine
2016-12-20 11:14:39 +08:00
2679f51d97
updates to d4win description per review comments
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 56af047ca8e1fbe989072cad7c722446aa2b6177
Component: engine
2016-12-19 17:41:51 -08:00
106e0d2810
updates to glossary re: d4mac, d4win, toolbox per user request
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: b9e5a6228f7e12eecca430f81adb8660fd89071d
Component: engine
2016-12-19 17:25:04 -08:00
5ad6259537
Merge pull request #29546 from cpuguy83/29505_fix_overay2_check_plugin
...
Ensure test graphdriver plugin runs on test host
Upstream-commit: 288e55c09b252e02b5201e7d2f2bf45a323d8105
Component: engine
2016-12-19 16:16:42 -08:00
6c8c837c0c
Merge pull request #29246 from thaJeztah/improve-swarm-check-in-inspect
...
Ignore certificate expiry error for top-level inspect
Upstream-commit: 77dde3efa7934959a762781ed42a64c70f49b9c2
Component: engine
2016-12-19 15:37:53 -08:00
ae0f2c64b3
Merge pull request #29339 from dmcgowan/plugins-abstract-download-manager
...
Abstract layerstore from pull/push distribution code
Upstream-commit: aecb79ff9866ec6b3536c50608706d2d4a6325df
Component: engine
2016-12-19 13:32:28 -08:00
cafaf16a79
Ensure test graphdriver plugin runs on test host
...
Sets a kernel requirement for for `TestGraphdriverPlugin` since the
graphdriver being used is overlay2.. and also makes sure to skip the
kernel check in the actual graphdriver since we may be able to detect
kernels with backported support for overlay2 style mounts a bit more
freely in the test code.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e4ebc92edc85d2f46cf41c4ad9514ba0fbafed06
Component: engine
2016-12-19 16:05:22 -05:00
b95defdddf
Merge pull request #29551 from albers/completion-remove-daemon
...
Remove bash completion for deprecated `docker daemon`
Upstream-commit: db5159b78d2e519b7c168afa8136417ae99e5765
Component: engine
2016-12-19 20:52:13 +01:00
a9e33d7f0c
Remove bash completion for deprecated docker daemon
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 536a9ec698b8a2f51102b2c57cd9c675873b9af4
Component: engine
2016-12-19 11:40:59 -08:00
Vincent Demeester
Brian Goff
Doug Davis
allencloud
Eric Curtin
Sebastiaan van Stijn
Jie Luo
Xinbo Weng
WANG Yuexiao
Anran Qiao
Yong Tang
lixiaobing10051267
Misty Stanley-Jones
John Stephens
Harald Albers
Tibor Vass
liwenqi
Akihiro Suda
EnergyLiYN
Victoria Bialas
Tõnis Tiigi