Sebastiaan van Stijn
7b29c9a4ce
Fix docs cherry-pick
...
commit d7bc6e4e7c
2017-04-06 01:07:46 +02:00
Victor Vieux
c79660699b
Merge pull request #32322 from thaJeztah/17.03.1-cherry-picks
...
[17.03.x] docs cherry picks
2017-04-03 11:47:53 -07:00
Sebastiaan van Stijn
9c3b01cbb3
Merge pull request #32183 from JimGalasyn/delete-h1
...
Delete extraneous H1 title
(cherry picked from commit 0c59283fc3
2017-04-03 17:11:55 +02:00
Vincent Demeester
a024e2ad6a
Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc
...
Updated push.md with progress bar info
(cherry picked from commit a048e131be
2017-04-03 17:11:50 +02:00
Sebastiaan van Stijn
6421a8d8c8
Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated
...
Fix indenting in deprecated engine features toc
(cherry picked from commit 0f8a3dafa4
2017-04-03 17:11:45 +02:00
John Howard
861311f17d
Merge pull request #31980 from JohnMaguire/doc-update
...
Add note regarding Windows VOLUME limitations
(cherry picked from commit c33c457852
2017-04-03 17:11:39 +02:00
Vincent Demeester
70faa0801c
Merge pull request #31973 from wsong/update_df_docs
...
Update system df docs to call out performance implications
(cherry picked from commit f453412bd8
2017-04-03 17:11:34 +02:00
Sebastiaan van Stijn
44a975201b
Merge pull request #31969 from vdemeester/fix-images-reference-docs-filter-list
...
Add `reference` filter to the list of available filters
(cherry picked from commit 4c7941d391
2017-04-03 17:11:29 +02:00
Sebastiaan van Stijn
da722663b7
Merge pull request #31911 from allencloud/specify-max-size-for-secret-in-doc
...
specify max size for secret in doc
(cherry picked from commit 7c7cc0bbdc
2017-04-03 17:11:22 +02:00
Sebastiaan van Stijn
311c465578
Merge pull request #31901 from davidxia/fix-docs
...
[docs] Fix incorrect `docker inspect` example
(cherry picked from commit b385a9156e
2017-04-03 17:11:17 +02:00
Sebastiaan van Stijn
3006a837d5
Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference
...
docs: remove outdated reference to updating /etc/hosts(cherry picked from commit 5126862d43
2017-04-03 17:11:11 +02:00
Sebastiaan van Stijn
f4f8e9481f
Merge pull request #31619 from rcjsuen/patch-1
...
Fix typo in sample output
(cherry picked from commit aa534d3bb2
2017-04-03 17:11:06 +02:00
Sebastiaan van Stijn
4e5b668b1c
Merge pull request #31596 from rootsongjc/dry-run-test
...
Wrong entrypoint in docker plugin example
(cherry picked from commit 0bc84fc06c
2017-04-03 17:10:59 +02:00
Vincent Demeester
4fdfe3af0b
Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental
...
Update docs for experimental features
(cherry picked from commit bd811aa4fd
2017-04-03 17:09:36 +02:00
Sebastiaan van Stijn
039fb56e63
Merge pull request #32126 from vdemeester/docs-ref-cli-root-commands
...
Add cli reference docs for root-level commands
(cherry picked from commit cf113faca6
2017-04-03 17:05:03 +02:00
Tibor Vass
1be1fd6a8c
Merge pull request #31496 from vieux/update_deprecation
...
update deprecation dates
(cherry picked from commit 0ab40a7552
2017-04-03 17:04:44 +02:00
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
Vincent Demeester
7d81f815b7
Merge pull request #31480 from thaJeztah/carry-31213-update-experimental-index
...
[carry 31213] Update index.md
(cherry picked from commit 6361117b59
2017-04-03 17:04:37 +02:00
Brian Goff
e4f216c4fe
Merge pull request #30568 from khudgins/nimbleplugin
...
added listing for Nimble Storage's volume plugin
(cherry picked from commit ba5c0f88d5
2017-04-03 17:02:31 +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
