38c03e66d8
Merge pull request #31291 from albers/docs-daemon-hosts
...
Clarify why `hosts` in `daemon.json` does not work
Upstream-commit: 27c9a6e9c22a6cf0c6dae7f59cf8f7d56a67f560
Component: engine
2017-02-23 10:47:26 -05:00
6e26e75ead
Clarify why hosts in daemon.json does not work
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 340b75dd41d026e6f6072da851930d6802a1ee34
Component: engine
2017-02-23 14:03:58 +01:00
718b046537
Delete dots to align with other commands description
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: ec95ad7353b240542f73076dde975e392c281748
Component: engine
2017-02-23 16:46:08 +08:00
79d868fec9
Merge pull request #31031 from WeiZhang555/stats-all-docs
...
[Docs] Add docs for stating stopped containers
Upstream-commit: 4534dcd494979ea89d8243002fb478857e25032d
Component: engine
2017-02-22 11:14:15 +01:00
301cc805aa
Merge pull request #30814 from YuPengZTE/devSwarmCliExplain
...
fix the type
Upstream-commit: 25500d56a5f3a94456bd8172a64bf119cc36dd7f
Component: engine
2017-02-21 00:59:58 +01:00
c4ca316177
Merge pull request #31034 from erxian/refine-service-update-document
...
add rollback explanation to docker service update command document
Upstream-commit: 75843d36aa5c3eaade50da005f9e0ff2602f3d5e
Component: engine
2017-02-20 09:29:38 +01:00
07ac2fb3ec
add rollback explanation to docker service update command document
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 34919accaa1f43fce17398aa82430cfe5883ea2f
Component: engine
2017-02-20 11:37:07 +08:00
adced63586
Merge pull request #30898 from allencloud/add-link-query-in-container-rm-api-doc
...
add link query in container rm api doc
Upstream-commit: b89aff1afa1f61993ab2ba18fd62d9375a195f5d
Component: engine
2017-02-18 09:53:51 -08:00
043ff88c00
Update version-history.md for ReadOnly parameter
...
This fix updates the `docs/api/version-history.md`
for `ReadOnly` parameter, which is now available in
`POST /services/create` and `POST /services/(id or name)/update`.
This fix is a follow up to 30162.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 097b38c15d420cc467e4bc3587dfe505a4748b47
Component: engine
2017-02-17 19:18:37 -08:00
00a09015ca
Merge pull request #29984 from jmzwcn/issueNNP
...
[feature]: add daemon flag to set no_new_priv as default for unprivileged containers
Upstream-commit: 6dd2a82458016d15786b0bb12ba4cecde9b6bb90
Component: engine
2017-02-17 11:43:43 -08:00
b7f72f988d
Merge pull request #28213 from yongtang/11062016-service-ps-format
...
Add `--format` to `docker service ps`
Upstream-commit: b1debf1374ca7be7e7b4d4fcd41eceaf8b7cf153
Component: engine
2017-02-17 10:23:18 -08:00
c5276a2bfc
Merge pull request #30679 from mlaventure/cgroup-devices-docs
...
Add example for --device-cgroup-rule to create reference
Upstream-commit: 623612fe09b72a907269a7d7fca94f7aeda1747c
Component: engine
2017-02-16 21:18:04 -05:00
3ba3328157
Add daemon flag to set no_new_priv as default for unprivileged containers.
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: d7fda019bb7e24f42f8ae1ddecb3fd52df3c48bf
Component: engine
2017-02-16 19:05:14 +08:00
fea229adb1
[Docs] Add docs for stating stopped containers
...
This commit adds docs with example showing `docker stats` stopped
containers.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 7a36d55a86e5d443f1de5b7b32d710cc65671a92
Component: engine
2017-02-15 14:20:30 +08:00
fe6344a73e
Fix some Liquid errors
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 2e19cc0cc463a4fd76e74b74a4efeb162f813c13
Component: engine
2017-02-14 16:40:15 -08:00
2315da980a
Merge pull request #30524 from mstanleyjones/30149_update_plugin_apidocs
...
Update plugin_volume apidocs for v2
Upstream-commit: 3dc87714d1bfcaf0620fabec3bfea89620b59337
Component: engine
2017-02-14 15:27:04 -08:00
9e811ad5ef
Merge pull request #30921 from anusha-ragunathan/debug_docs
...
Add plugin socket related debug docs.
Upstream-commit: fddab1444f2c2f7e240a4bde10971ed84967767b
Component: engine
2017-02-14 13:10:23 -08:00
06c085bc74
Add plugin socket related debug docs.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 6b8ae528655f65403c4d75d4bd9ce576cd26ff82
Component: engine
2017-02-14 12:13:48 -08:00
a532e48c46
fix the type
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: d735972d3150fa4e286ce468f033156fa22fddb7
Component: engine
2017-02-14 09:54:27 +08:00
d65a5e678c
Update plugin_volume apidocs for v2
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 48ccdf1f7aa28c14117076f940f66ce753283117
Component: engine
2017-02-13 16:28:54 -08:00
ec2663feb9
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
...
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 52379fa76dee07ca038624d639d9e14f4fb719ff
Component: engine
2017-02-13 11:01:54 -08:00
0b67975de7
Merge pull request #30965 from YuPengZTE/devDes
...
fix typo
Upstream-commit: a8f4d82176139babcd818fcb4590eec22860ffc9
Component: engine
2017-02-13 00:02:28 -08:00
4d0e710fd3
fix typo
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: 266107f301b8d470f6ff67da41960fccf9e1a4ba
Component: engine
2017-02-13 15:47:38 +08:00
b0073b9ee0
Add missing link in deprecated.md
...
This fix adds a missing link in deprecated.md
```
Deprecated In Release: [v1.13.0]...
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ee65dd0286b2e3d5d5b3a61c24972b962363c0de
Component: engine
2017-02-12 15:15:52 -08:00
08e260c901
Add --format to docker service ps
...
This fix tries to address the issue raised in 27189 where
it is not possible to support configured formatting stored in
config.json.
Since `--format` was not supported in `docker service ps`,
the flag `--format` has also been added in this fix.
This fix
1. Add `--format` to `docker service ps`
2. Add `tasksFormat` to config.json
3. Add `--format` to `docker stack ps`
4. Add `--format` to `docker node ps`
The related docs has been updated.
An integration test has been added.
This fix fixes 27189.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f8c7c921d905615acf1d2c6577ae1cfb4600bec0
Component: engine
2017-02-10 16:53:04 -08:00
796599868e
Merge pull request #29559 from mstanleyjones/define_bridge
...
Define bridge networks
Upstream-commit: c621fbce04ec845d5f9254bc59b11dfe06fff0e0
Component: engine
2017-02-10 09:25:29 -08:00
439a3c18ed
add link query in container rm api doc
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 2972b99f1b0c615d5a6e3ee1645ed104cfb8fe94
Component: engine
2017-02-11 00:17:37 +08:00
99d3239faa
Merge pull request #30702 from allencloud/update-api-docs-about-filters
...
add missing filter type in swagger.yml and sort filter type in alphabets
Upstream-commit: 10c0af083544460a2ddc2218f37dc24a077f7d90
Component: engine
2017-02-09 10:33:49 -05:00
935c4823a4
Merge pull request #30849 from vieux/bump_api_1.27
...
bump engine API to 1.27
Upstream-commit: cff32a411a7f1253a772a8f7a348be5364ffb3ac
Component: engine
2017-02-09 13:48:43 +00:00
7196026b57
Standardized formatting of CLI reference commands
...
Command name should be a H1
Only Description, Examples, and Related Commands should be H2
Changed 'Related information' heading to 'Related commands' since 99% it is only linking commands
Added some examples where relevant
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 52df69f00d966904ba230dc2e3a0646cc52b7688
Component: engine
2017-02-08 16:57:58 -08:00
1ecb43d9ed
Removed unused image
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 80ee21e533e6c88dcdc293d5e88b330f777acee2
Component: engine
2017-02-08 16:38:31 -08:00
6966820198
Add info about the relationship between swarm leave and node rm
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: e2ce8703711b5b07e60eb5e09c18214a74b6d041
Component: engine
2017-02-08 16:38:31 -08:00
388cfd9d1a
bump engine API to 1.27
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 6bad3fc9fbcdef48b3b0b2fbb5cbaf530cc4db56
Component: engine
2017-02-08 16:14:58 -08:00
5b20abeadf
Merge pull request #29906 from allencloud/update-events-related-things
...
update events related doc and swagger.yml
Upstream-commit: dea528e8cd044de6ca08f7c9bb2e7581774743d6
Component: engine
2017-02-08 14:13:37 -08:00
e0d975b4ca
Define bridge networks
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 1e74df3637c1497f7adc3bd7aebd95baaa4c8e22
Component: engine
2017-02-08 13:33:34 -08:00
e552136043
Merge pull request #30802 from anusha-ragunathan/debug_docs
...
Add plugin debug docs.
Upstream-commit: d4be5a2f677ddfee92c794503c7119d0a2de7a89
Component: engine
2017-02-08 11:49:11 -08:00
47d6168303
Add plugin debug docs.
...
Doc fix for #30761
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 94c40a30747ce77dc2191627645fec9c71a90a99
Component: engine
2017-02-08 11:46:24 -08:00
1b9a800107
Merge pull request #30661 from yongtang/02012017-man-expose-publish-filter
...
Update API history and man page for `--filter expose/publish`
Upstream-commit: 91f36e4b8ae9040b6d6c425a8263936dc9873691
Component: engine
2017-02-07 14:05:36 -08:00
fcde483797
Merge pull request #30523 from nathanleclaire/document_init
...
Document --init flag for docker run
Upstream-commit: e0cc664cc34959b301849378f3e98146b079fc5e
Component: engine
2017-02-07 09:28:30 -08:00
49889e6daa
Update API history and man page for --filter expose/publish
...
This fix updates API history and man page for
`docker ps --filter expose/publish`, from the feedback:
https://github.com/docker/docker/pull/27557#issuecomment-276832876
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9fc393615f6aae1a70ba282123ee15afc23a6297
Component: engine
2017-02-07 08:24:46 -08:00
3f7730c74a
Merge pull request #30734 from allencloud/add-400-status-code-for-events-endpoint
...
add status code 400 for api endpoint /events
Upstream-commit: f3da980a459c11a35248daa8a6be9919bf65fda2
Component: engine
2017-02-07 17:02:50 +01:00
48134e2cad
Fix grammatical error in swarm_leave.md
...
Correct this sentence so it reads correctly. "to on a manager" should be
"on a manager".
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 248b1c23d37e1e32af66583f8d14d9f8742280ef
Component: engine
2017-02-06 17:31:55 -08:00
8b439bbd93
Merge pull request #30701 from allencloud/add-status-code-404-for-plugin-in-api-doc
...
add status code 404 for plugin api endpoint enable and disable
Upstream-commit: 0113128b2a79a9cef9950e71e0681380b240faf4
Component: engine
2017-02-06 11:53:17 -08:00
fe36f50059
add expose and publish filter in swagger.yml and CLI docs for docker/master
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 44bd658913647ddadc3c225233c08ee61ef3c5ed
Component: engine
2017-02-04 14:28:14 +08:00
84924e41d8
add missing filter type and sort filter type in alphabets
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: da1f05d66de409294e535fbefb968ce040248e3e
Component: engine
2017-02-04 14:25:55 +08:00
8dc7e39e0a
add status code 400 for api endpoint /events
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 323f575087d7e2068d74598283ec485b1f115226
Component: engine
2017-02-04 13:40:24 +08:00
327117961b
Merge pull request #30553 from lewisdaly/21050-improve-user-namespace-docs
...
Updated dockerd docs with note about user namespaces
Upstream-commit: d6b1b532a1e12c4969772519cb2643b285d1318f
Component: engine
2017-02-03 19:48:06 -08:00
6fc03b6025
Updated dockerd docs with note about user namespaces
...
Signed-off-by: Lewis Daly <lewisdaly@me.com >
Updated uid/gid reference to be more canonical - and signed commit
Signed-off-by: Lewis Daly <lewisdaly@me.com >
Editorial suggestion
I tried my hand at rewriting this a bit for readability. Can you please verify that the facts are correct, especially about the permission changes? You can feel free to squash my commit with yours so that it's signed. You'll need to pull the change from your fork to work on it locally.
Editorial suggestion
I tried my hand at rewriting this a bit for readability. Can you please verify that the facts are correct, especially about the permission changes? You can feel free to squash my commit with yours so that it's signed. You'll need to pull the change from your fork to work on it locally.
Upstream-commit: 2f9280dcd05f965a24c2f4112a328be59f116412
Component: engine
2017-02-04 13:50:50 +10:30
7b0b9f56f9
Merge pull request #30673 from mavenugo/nr
...
List Networks need not pull all the endpoints
Upstream-commit: 4dbc105fc1dc572577f48a69fcecc475ba81b576
Component: engine
2017-02-03 19:09:43 -08:00
e6c5fda6f5
Merge pull request #29414 from cpuguy83/plugin_upgrade
...
Add docker plugin upgrade
Upstream-commit: fa49c076d44365f77f392b72fd181db0524a18fb
Component: engine
2017-02-03 15:27:48 -08:00
