Vincent Demeester
8e45d27673
Merge pull request #32191 from tiborvass/yaml-docs-gen-17_03
...
[17.03] docs: added support for CLI yaml file generation
2017-04-03 17:04:38 +02:00
Sven Breuner
35c5eaf80e
Updated legacy_plugins.md to include BeeGFS plugin
...
Signed-off-by: Sven Breuner <sven.breuner@thinkparq.com>
2017-03-31 17:14:26 +02:00
French Ben
43e3b8d2cc
docs: added support for CLI yaml file generation
...
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 5443f0152f
2017-03-28 17:41:46 -07:00
Linhua Tan
72ed80a82a
update service-create.md
...
typo
Signed-off-by: 谭林华 <linhua.tlh@alibaba-inc.com>
2017-03-16 17:25:58 +08:00
Misty Stanley-Jones
1313d424eb
Fix markdown in references for Kramdown
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 0ce13eb0d3
2017-03-13 21:21:20 -07:00
Ian Campbell
9b001c4f5f
Correct CPU usage calculation in presence of offline CPUs and newer Linux
...
In https://github.com/torvalds/linux/commit/5ca3726 (released in v4.7-rc1) the
content of the `cpuacct.usage_percpu` file in sysfs was changed to include both
online and offline cpus. This broke the arithmetic in the stats helpers used by
`docker stats`, since it was using the length of the PerCPUUsage array as a
proxy for the number of online CPUs.
Add current number of online CPUs to types.StatsJSON and use it in the
calculation.
Keep a fallback to `len(v.CPUStats.CPUUsage.PercpuUsage)` so this code
continues to work when talking to an older daemon. An old client talking to a
new daemon will ignore the new field and behave as before.
Fixes #28941 .
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
(cherry picked from commit 115f91d757
2017-03-13 16:16:05 -07:00
Sebastiaan van Stijn
de692b1065
Merge pull request #31467 from thaJeztah/remove-jekyll-markers
...
remove Jekyll tags from CLI reference
(cherry picked from commit 9321a12115
2017-03-02 11:03:57 +01:00
Sebastiaan van Stijn
9f55f97a5a
Merge pull request #31398 from pjaffe/patch-1
...
Remove incorrect duplicate phrase from build.md
(cherry picked from commit fb5ccc6605
2017-03-02 11:03:51 +01:00
Brian Goff
ef658fa65e
Merge pull request #31291 from albers/docs-daemon-hosts
...
Clarify why `hosts` in `daemon.json` does not work
(cherry picked from commit 27c9a6e9c2
2017-03-02 11:03:46 +01:00
Vincent Demeester
f6b33c65d5
Merge pull request #31034 from erxian/refine-service-update-document
...
add rollback explanation to docker service update command document
(cherry picked from commit 75843d36aa
2017-02-22 00:49:16 +01:00
Sebastiaan van Stijn
23de3ee83b
Merge pull request #31023 from mstanleyjones/fix_liquid_errors
...
Fix some Liquid errors
(cherry picked from commit 88de5c36c7
2017-02-22 00:49:10 +01:00
Sebastiaan van Stijn
93daa00ee6
Merge pull request #30965 from YuPengZTE/devDes
...
fix typo
(cherry picked from commit a8f4d82176
2017-02-22 00:49:03 +01:00
Sebastiaan van Stijn
1f1b15ae4c
Merge pull request #30956 from yongtang/02122017-deprecated-login-email-removal
...
Add missing link in deprecated.md
(cherry picked from commit b5b6752230
2017-02-22 00:48:56 +01:00
Sebastiaan van Stijn
411ff56edf
Merge pull request #30921 from anusha-ragunathan/debug_docs
...
Add plugin socket related debug docs.
(cherry picked from commit fddab1444f
2017-02-22 00:48:50 +01:00
Sebastiaan van Stijn
fdd29d9085
Merge pull request #30898 from allencloud/add-link-query-in-container-rm-api-doc
...
add link query in container rm api doc
(cherry picked from commit b89aff1afa
2017-02-22 00:48:39 +01:00
Sebastiaan van Stijn
c611906062
Merge pull request #30804 from mstanleyjones/cli_fixups
...
Cli fixups
(cherry picked from commit 40dbbd3f9b
2017-02-22 00:48:21 +01:00
Sebastiaan van Stijn
8893cd6095
Merge pull request #30802 from anusha-ragunathan/debug_docs
...
Add plugin debug docs.
(cherry picked from commit d4be5a2f67
2017-02-22 00:48:15 +01:00
Sebastiaan van Stijn
0a506d9429
Merge pull request #30774 from aaronlehmann/swarm-leave-docs-fix
...
Fix grammatical error in swarm_leave.md
(cherry picked from commit 9e80a2a457
2017-02-22 00:48:04 +01:00
Sebastiaan van Stijn
f28a1d3c23
Merge pull request #30663 from Mashimiao/reference-cmdline-service-tfix
...
reference/commandline: small tfix
(cherry picked from commit 32697b57c8
2017-02-22 00:47:59 +01:00
Vincent Demeester
56da5fa29b
Merge pull request #30619 from johndmulhausen/patch-3
...
Fix for 404 in docs
(cherry picked from commit 1de72681b5
2017-02-22 00:47:45 +01:00
Sebastiaan van Stijn
84f026ba7e
Merge pull request #30553 from lewisdaly/21050-improve-user-namespace-docs
...
Updated dockerd docs with note about user namespaces
(cherry picked from commit d6b1b532a1
2017-02-22 00:47:39 +01:00
Sebastiaan van Stijn
492f2ab8fe
Merge pull request #30524 from mstanleyjones/30149_update_plugin_apidocs
...
Update plugin_volume apidocs for v2
(cherry picked from commit 3dc87714d1
2017-02-22 00:47:33 +01:00
Misty Stanley-Jones
137b05e9f5
Merge pull request #30523 from nathanleclaire/document_init
...
Document --init flag for docker run
(cherry picked from commit e0cc664cc3
2017-02-22 00:47:27 +01:00
Sebastiaan van Stijn
48ea08613f
Merge pull request #30387 from coolljt0725/fix_typo
...
typo: fix typo in api documents
(cherry picked from commit de1a403810
2017-02-22 00:47:21 +01:00
Vincent Demeester
8b34bd1980
Merge pull request #30130 from ijc25/clarify-cp-docs
...
Clarify `cp` documentation behaviour with trailing "/."
(cherry picked from commit 8b7ba17d33
2017-02-22 00:47:16 +01:00
Sebastiaan van Stijn
6e9f3fda73
Merge pull request #30094 from miaoyq/complete-opt-for-plugin-install
...
Complete the options for 'docker plugin install'
(cherry picked from commit 8c7651998f
2017-02-22 00:47:10 +01:00
Sebastiaan van Stijn
e688aacaa5
Merge pull request #30011 from davidwilliamson/patch-1
...
Provide password to volume create command
(cherry picked from commit 36db5f6f68
2017-02-22 00:47:04 +01:00
Vincent Demeester
03ed0afa29
Merge pull request #30000 from ralphtheninja/master
...
Attempts -> MaxAttempts in /services/create
(cherry picked from commit 4166801f60
2017-02-22 00:46:58 +01:00
Alexander Morozov
d9e0ef7cc8
Merge pull request #29830 from timthelion/issue29821
...
Docs: Be more clear when specifying valid formats for strings
(cherry picked from commit effc91e7a5
2017-02-22 00:46:48 +01:00
Vincent Demeester
ff8f643ce1
Merge pull request #29774 from miaoyq/complete-plugin-create-docs-content
...
Complete the document content
(cherry picked from commit 5374d53322
2017-02-22 00:46:42 +01:00
Sebastiaan van Stijn
d38979b8bb
Merge pull request #29763 from omallo/29729-dostorage-plugin-docs
...
Reference new DigitalOcean plugin (Closes #29729 )
(cherry picked from commit 841968d55c
2017-02-22 00:46:36 +01:00
Sebastiaan van Stijn
6458b4e951
Merge pull request #29744 from yuexiao-wang/update-docker-ps
...
Update the field 'CONTAINER ID' for docker ps
(cherry picked from commit 01c62d6e54
2017-02-22 00:46:31 +01:00
Vincent Demeester
a405b95bcf
Merge pull request #29699 from yuexiao-wang/update-index
...
Update the index of docker command line
(cherry picked from commit af843c53f8
2017-02-22 00:46:24 +01:00
Sebastiaan van Stijn
676b256bf2
Merge pull request #29696 from zhenghenghuo/branch-two
...
fix some typos
(cherry picked from commit 38178cda41
2017-02-22 00:46:18 +01:00
Akihiro Suda
db2e6cbc86
Merge pull request #29693 from davidxia/fix-typo
...
Fix typo in docs
(cherry picked from commit fb03b56b9b
2017-02-22 00:46:12 +01:00
Sebastiaan van Stijn
25e8ff2b02
Merge pull request #29615 from londoncalling/docs-glossary-followup-PR#29561
...
followup to incorporate review comments per previous reviews on PR#29561
(cherry picked from commit b39b0c4596
2017-02-22 00:46:07 +01:00
Vincent Demeester
ba82978208
Merge pull request #29603 from mstanleyjones/docker_diff_improvements
...
Clarify what docker diff shows
(cherry picked from commit 0ca3e84227
2017-02-22 00:46:02 +01:00
Vincent Demeester
0e3248ebeb
Merge pull request #29600 from allencloud/update-docs-about-service-update
...
update service update in docs
(cherry picked from commit 524704143b
2017-02-22 00:45:56 +01:00
Brian Goff
d383ff9e4d
Merge pull request #29589 from lixiaobing10051267/masterDockerPs
...
field NAMES ommitted after docker ps in commit.md
(cherry picked from commit 9eb9abea6d
2017-02-22 00:45:49 +01:00
Sebastiaan van Stijn
23c03e1146
Merge pull request #29569 from allencloud/update-docs-about-oom-score-adj
...
update docs about --oom-score-adj
(cherry picked from commit 0d93970c52
2017-02-22 00:45:43 +01:00
Sebastiaan van Stijn
199cd1e36e
Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win
...
updates to glossary re: d4mac, d4win, toolbox per user request
(cherry picked from commit fb41283e49
2017-02-22 00:45:37 +01:00
Misty Stanley-Jones
114aa22e97
Merge pull request #29559 from mstanleyjones/define_bridge
...
Define bridge networks
(cherry picked from commit c621fbce04
2017-02-22 00:45:30 +01:00
Vincent Demeester
8051adc7f3
Merge pull request #29541 from tim-zju/spellError
...
spell error: in other parts, they are lower-case
(cherry picked from commit 8a41c1d548
2017-02-22 00:45:20 +01:00
Vincent Demeester
a2ca630175
Merge pull request #29468 from hongbin/volume-plugin-fuxi
...
Add Fuxi Volume Plugin to the docs
(cherry picked from commit 13f45768f0
2017-02-22 00:45:09 +01:00
Vincent Demeester
9dcb36dfa2
Merge pull request #30734 from allencloud/add-400-status-code-for-events-endpoint
...
add status code 400 for api endpoint /events
(cherry picked from commit f3da980a45
2017-02-17 13:24:41 -08:00
allencloud
9f46122c94
add missing filter type and sort filter type in alphabets
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit da1f05d66d
2017-02-17 13:24:41 -08:00
Anusha Ragunathan
951ffc056b
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
(cherry picked from commit 0113128b2a
2017-02-17 13:24:40 -08:00
Sebastiaan van Stijn
ed6e849a1c
Merge pull request #29906 from allencloud/update-events-related-things
...
update events related doc and swagger.yml
(cherry picked from commit dea528e8cd
2017-02-17 13:24:40 -08:00
Victor Vieux
fc0b5dbedb
bump api version to 1.26
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-07 16:42:41 -08:00
Brian Goff
1a17bc6bc4
Make propagated mount persist outside rootfs
...
This persists the "propagated mount" for plugins outside the main
rootfs. This enables `docker plugin upgrade` to not remove potentially
important data during upgrade rather than forcing plugin authors to hard
code a host path to persist data to.
Also migrates old plugins that have a propagated mount which is in the
rootfs on daemon startup.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit e8307b868d
2017-02-03 19:15:23 -05:00
