Sebastiaan van Stijn
639112b091
Merge pull request #32282 from mstanleyjones/improve-attach-desc
...
Clarify meaning of docker attach
(cherry picked from commit 571e403168
)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-12 14:48:12 -07:00
Misty Stanley-Jones
abfd780ba3
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>
(cherry picked from commit 52df69f00d
)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-12 12:27:37 -07:00
Sebastiaan van Stijn
b341c80644
Merge pull request #32304 from thaJeztah/master-cherry-pick-32265
...
[master] cherry-pick Updated legacy_plugins.md to include BeeGFS plugin
(cherry picked from commit 2347020706
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:39:19 +02:00
Aaron Lehmann
1b91555700
Merge pull request #32200 from yuexiao-wang/update-usage
...
fix inconsistency for docker service ps
(cherry picked from commit 278b36e5ce
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:39:08 +02:00
Vincent Demeester
7ec084a742
Merge pull request #32199 from yuexiao-wang/add-examples
...
provide `docker stack ps` examples
(cherry picked from commit 36c2f2731d
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:38:58 +02:00
Sebastiaan van Stijn
6e58fd8710
Merge pull request #32183 from JimGalasyn/delete-h1
...
Delete extraneous H1 title
(cherry picked from commit 0c59283fc3
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:38:43 +02:00
Vincent Demeester
6a7164ad33
Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc
...
Updated push.md with progress bar info
(cherry picked from commit a048e131be
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:35:26 +02:00
Sebastiaan van Stijn
a81b14a5d7
Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated
...
Fix indenting in deprecated engine features toc
(cherry picked from commit 0f8a3dafa4
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:35:17 +02:00
John Howard
5584897f59
Merge pull request #31980 from JohnMaguire/doc-update
...
Add note regarding Windows VOLUME limitations
(cherry picked from commit c33c457852
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:35:06 +02:00
Vincent Demeester
f4da7448ee
Merge pull request #31973 from wsong/update_df_docs
...
Update system df docs to call out performance implications
(cherry picked from commit f453412bd8
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:34:57 +02:00
Sebastiaan van Stijn
b8673671ef
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
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:34:42 +02:00
Sebastiaan van Stijn
dcaf5334ab
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
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:34:32 +02:00
Victor Vieux
338e7a0b60
Merge pull request #31902 from thaJeztah/master-cherry-pick-31875
...
cherry-pick 31875 - update service-create.md
(cherry picked from commit f148ad38e5
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:34:20 +02:00
Sebastiaan van Stijn
76a0c400d8
Merge pull request #31901 from davidxia/fix-docs
...
[docs] Fix incorrect `docker inspect` example
(cherry picked from commit b385a9156e
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:34:11 +02:00
Sebastiaan van Stijn
a95e8154e8
Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference
...
docs: remove outdated reference to updating /etc/hosts(cherry picked from commit 5126862d43
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:33:58 +02:00
Vincent Demeester
aad95ccba9
Merge pull request #31749 from yallop/docs-31047
...
Add documentation for bind mount consistency flags (#31047 ).
(cherry picked from commit 94394026a8
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:33:41 +02:00
Sebastiaan van Stijn
21d5e8ba4f
Merge pull request #31619 from rcjsuen/patch-1
...
Fix typo in sample output
(cherry picked from commit aa534d3bb2
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:32:05 +02:00
Sebastiaan van Stijn
1ea62f8807
Merge pull request #31596 from rootsongjc/dry-run-test
...
Wrong entrypoint in docker plugin example
(cherry picked from commit 0bc84fc06c
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:31:24 +02:00
Vincent Demeester
fcf640efce
Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental
...
Update docs for experimental features
(cherry picked from commit bd811aa4fd
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 16:21:25 +02:00
French Ben
b82fe694d4
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
)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:29:36 -07:00
Vincent Demeester
101369979a
Add cli reference docs for root-level commands
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 9cea26bc77
)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 17:24:23 -07:00
Sebastiaan van Stijn
2387faa6de
deprecation and changelog updates for 17.04
...
- Interacting with V1 registries is not yet disabled by default, so moving the deprecation version
- Added various entries to the changelog, and moved some to a different section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-15 18:40:47 +01:00
Victor Vieux
cec9594947
Merge pull request #31790 from mlaventure/devicecgrouprules-api-swagger
...
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
2017-03-14 16:51:09 -07:00
Victor Vieux
1a24abe42d
Merge pull request #31809 from vieux/bump_api
...
bump API to 1.28
2017-03-14 11:53:52 -07:00
Victor Vieux
cd173a6030
bump API to 1.28
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-14 09:32:50 -07:00
Kenfe-Mickael Laventure
6e97f11df9
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-14 07:24:29 -07:00
Harald Albers
0a1ace9d2f
Remove docs for dockerd --no-new-privileges
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-14 10:00:14 +01:00
Madhu Venugopal
cdf66ba715
Merge pull request #31710 from sanimej/drillerrr
...
Add verbose flag to network inspect to show all services & tasks in swarm mode
2017-03-13 21:12:32 -07:00
Santhosh Manohar
14f76a21db
Enhance network inspect to show all tasks, local & non-local, in swarm mode
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2017-03-13 17:52:08 -07:00
Tibor Vass
f947d823f0
Merge pull request #31767 from mstanleyjones/fix_tables
...
Fix markdown in references for Kramdown
2017-03-13 14:13:15 -07:00
Justin Cormack
2c6a1e1878
Merge pull request #31579 from ijc25/cpuacct
...
Correct CPU usage calculation in presence of offline CPUs and newer Linux
2017-03-13 16:32:18 +00:00
Vincent Demeester
4744b01d3b
Merge pull request #31712 from rcjsuen/patch-2
...
Fix directive example to match description
2017-03-13 16:34:29 +01:00
Misty Stanley-Jones
0ce13eb0d3
Fix markdown in references for Kramdown
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-03-12 12:01:06 -07:00
Ian Campbell
115f91d757
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>
2017-03-10 10:24:33 +00:00
Remy Suen
f00fa63988
Fix directive example to match description
...
The description claims the directive is appearing after a comment but
the sample Dockerfile has the directive appear after an instruction.
Changed the ordering of the lines to match the example's description.
Signed-off-by: Remy Suen <remy.suen@gmail.com>
2017-03-10 07:11:30 +09:00
John Laswell
4a20252137
Fix typo in run.md documentation
...
Signed-off-by: John Laswell <john.n.laswell@gmail.com>
2017-03-09 13:08:48 -05:00
Harald Albers
b303e229ca
Fix description of docker run|create --stop-signal
in help message
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-09 09:32:16 +01:00
Brian Goff
ba5c0f88d5
Merge pull request #30568 from khudgins/nimbleplugin
...
added listing for Nimble Storage's volume plugin
2017-03-07 09:31:53 -05:00
Keith Hudgins
05f37ad4f5
added listing for Nimble Storage's volume plugin
...
Signed-off-by: Keith Hudgins <greenman@greenman.org>
updated nimble plugin url
2017-03-06 12:15:25 -05:00
Aaron Lehmann
3a88a24d23
Add support for rollback flags
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-03 16:33:34 -08:00
Aaron Lehmann
cc9d04647a
Add support for the "rollback" failure action
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-03 16:33:34 -08:00
Sebastiaan van Stijn
3a5a1c3f3d
Merge pull request #30725 from aaronlehmann/topology
...
Topology-aware scheduling
2017-03-03 15:01:12 +01:00
Sebastiaan van Stijn
e1da516598
Merge pull request #30265 from allencloud/add-CheckDuplicate-details-and-logic
...
add CheckDuplicate docs and logics in network
2017-03-03 14:18:52 +01:00
Tibor Vass
0ab40a7552
Merge pull request #31496 from vieux/update_deprecation
...
update deprecation dates
2017-03-02 16:03:39 -08:00
scjane
e20bbe59e9
Update index.md
...
Signed-off-by: Wang Jie <wangjie5@chinaskycloud.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-02 12:18:55 +01:00
Sebastiaan van Stijn
7e3169f26d
remove Jekyll tags from CLI reference
...
These Markdown files are now embedded in a YAML
file for templating in the documentation, and
these special markers are no longer needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-02 02:14:15 +01:00
Sebastiaan van Stijn
bb9f19503c
Merge pull request #30754 from yongtang/25696-stop-signal
...
Add `--stop-signal` for `service create` and `service update`
2017-03-01 18:10:57 +01:00
Victor Vieux
5d68ef529b
update deprecation dates
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-27 17:16:47 -08:00
pjaffe
7623563575
Remove incorrect duplicate phrase from build.md
...
A phrase from the "Text files" section in build.md was incorrectly duplicated under the "Tarball contexts" section.
Signed-off-by: Peter Jaffe <pjaffe@nevo.com>
2017-02-27 17:05:24 -05:00
Aaron Lehmann
17288c611a
Topology-aware scheduling
...
This adds support for placement preferences in Swarm services.
- Convert PlacementPreferences between GRPC API and HTTP API
- Add --placement-pref, --placement-pref-add and --placement-pref-rm to CLI
- Add support for placement preferences in service inspect --pretty
- Add integration test
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-27 13:29:54 -08:00