Victor Vieux
61fa674abb
Merge pull request #31790 from mlaventure/devicecgrouprules-api-swagger
...
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
Upstream-commit: cec9594947c3666162e322252e4e69fbbcea096d
Component: engine
2017-03-14 16:51:09 -07:00
Victor Vieux
d136f71978
Merge pull request #31809 from vieux/bump_api
...
bump API to 1.28
Upstream-commit: 1a24abe42d1ad08b60c406b4cf95956dbc110ed6
Component: engine
2017-03-14 11:53:52 -07:00
Victor Vieux
9aea8ad976
bump API to 1.28
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: cd173a603003f3b15f4bae13e2e27b7ee1a46942
Component: engine
2017-03-14 09:32:50 -07:00
Kenfe-Mickael Laventure
713d7a3829
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6e97f11df9fa695ee1739bf55ab7166934746523
Component: engine
2017-03-14 07:24:29 -07:00
Harald Albers
8dd6a42039
Remove docs for dockerd --no-new-privileges
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0a1ace9d2f72f3e3c20e8ddad2407ba7145e3db5
Component: engine
2017-03-14 10:00:14 +01:00
Madhu Venugopal
95794e3edc
Merge pull request #31710 from sanimej/drillerrr
...
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: cdf66ba715c573f85338a2b2a432db6cb9a48e6d
Component: engine
2017-03-13 21:12:32 -07:00
Santhosh Manohar
ff11389227
Enhance network inspect to show all tasks, local & non-local, in swarm mode
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 14f76a21db71c5a817cb4d1e27f9940cefd5c820
Component: engine
2017-03-13 17:52:08 -07:00
Tibor Vass
77daab9192
Merge pull request #31767 from mstanleyjones/fix_tables
...
Fix markdown in references for Kramdown
Upstream-commit: f947d823f0b05655d1d6b99920dcc3ac54766a97
Component: engine
2017-03-13 14:13:15 -07:00
Justin Cormack
067b63e8af
Merge pull request #31579 from ijc25/cpuacct
...
Correct CPU usage calculation in presence of offline CPUs and newer Linux
Upstream-commit: 2c6a1e1878975550cd2e7a98494773903e39eaf7
Component: engine
2017-03-13 16:32:18 +00:00
Vincent Demeester
85b9c9f55a
Merge pull request #31712 from rcjsuen/patch-2
...
Fix directive example to match description
Upstream-commit: 4744b01d3bfcb5cfe320bb239894cb6b67165245
Component: engine
2017-03-13 16:34:29 +01:00
Misty Stanley-Jones
8d8d9c4abd
Fix markdown in references for Kramdown
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0ce13eb0d343e81db7006fd9c3e0c95ee1c3925c
Component: engine
2017-03-12 12:01:06 -07:00
Ian Campbell
6f5f3ec34f
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 >
Upstream-commit: 115f91d7575d6de6c7781a96a082f144fd17e400
Component: engine
2017-03-10 10:24:33 +00:00
Remy Suen
6b69c9da09
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 >
Upstream-commit: f00fa639881a9ef2ab2959f11fa30554396a3dac
Component: engine
2017-03-10 07:11:30 +09:00
John Laswell
6aba7fbe3b
Fix typo in run.md documentation
...
Signed-off-by: John Laswell <john.n.laswell@gmail.com >
Upstream-commit: 4a20252137902100a8a01dd86c698e49dc00e8b2
Component: engine
2017-03-09 13:08:48 -05:00
Harald Albers
0d16f73693
Fix description of docker run|create --stop-signal in help message
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b303e229ca6ec61e43b1b7a93f6ff034a3945644
Component: engine
2017-03-09 09:32:16 +01:00
Brian Goff
86791f66a6
Merge pull request #30568 from khudgins/nimbleplugin
...
added listing for Nimble Storage's volume plugin
Upstream-commit: ba5c0f88d56b70f3dfa3d0652e30613ab332b92b
Component: engine
2017-03-07 09:31:53 -05:00
Keith Hudgins
01d59db55d
added listing for Nimble Storage's volume plugin
...
Signed-off-by: Keith Hudgins <greenman@greenman.org >
updated nimble plugin url
Upstream-commit: 05f37ad4f5a9c2c6ef634de9c0c8be6910d659d3
Component: engine
2017-03-06 12:15:25 -05:00
Aaron Lehmann
ac66308e6c
Add support for rollback flags
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3a88a24d23e6eb1ca521cd9ab6e306d4ba1c1464
Component: engine
2017-03-03 16:33:34 -08:00
Aaron Lehmann
0c390668f1
Add support for the "rollback" failure action
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: cc9d04647a68cf49e66bf26f10908387b99dae1a
Component: engine
2017-03-03 16:33:34 -08:00
Sebastiaan van Stijn
d4d27bb5d4
Merge pull request #30725 from aaronlehmann/topology
...
Topology-aware scheduling
Upstream-commit: 3a5a1c3f3d1638c35891ee630ba20eda0bef560f
Component: engine
2017-03-03 15:01:12 +01:00
Sebastiaan van Stijn
c09eedcd69
Merge pull request #30265 from allencloud/add-CheckDuplicate-details-and-logic
...
add CheckDuplicate docs and logics in network
Upstream-commit: e1da516598e6f4e8f58964fce62ff13be1d8cc09
Component: engine
2017-03-03 14:18:52 +01:00
Tibor Vass
6da6ca3b17
Merge pull request #31496 from vieux/update_deprecation
...
update deprecation dates
Upstream-commit: 0ab40a75521d5cb81daf1bdd2b2442bcde850f6e
Component: engine
2017-03-02 16:03:39 -08:00
scjane
5c5b34e757
Update index.md
...
Signed-off-by: Wang Jie <wangjie5@chinaskycloud.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e20bbe59e9815d14feec971706eb94160362ed8d
Component: engine
2017-03-02 12:18:55 +01:00
Sebastiaan van Stijn
948c24d8aa
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 >
Upstream-commit: 7e3169f26d4600691de9698598a2e5a064ea85eb
Component: engine
2017-03-02 02:14:15 +01:00
Sebastiaan van Stijn
13f20b59db
Merge pull request #30754 from yongtang/25696-stop-signal
...
Add `--stop-signal` for `service create` and `service update`
Upstream-commit: bb9f19503cbb0153a0da01b1e91691cd63f48dd9
Component: engine
2017-03-01 18:10:57 +01:00
Victor Vieux
20e8fcfbf4
update deprecation dates
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 5d68ef529bdc8bfd93bcac194dec47ba1df1f3cd
Component: engine
2017-02-27 17:16:47 -08:00
pjaffe
2fe0398b28
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 >
Upstream-commit: 76235635753fd37e8f94ecc01088a12dc550d2e1
Component: engine
2017-02-27 17:05:24 -05:00
Aaron Lehmann
737f03c444
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 >
Upstream-commit: 17288c611a4f3f75ecb3bbb4533820b1836c55a6
Component: engine
2017-02-27 13:29:54 -08:00
Anusha Ragunathan
fc85392e4c
Merge pull request #31071 from anusha-ragunathan/plugin_filter_network
...
Service creation using network plugin filters.
Upstream-commit: 52ce5c254880663e103e4e25f99700151ee6c2f8
Component: engine
2017-02-27 11:59:11 -08:00
Sebastiaan van Stijn
12aa0347d6
Merge pull request #30383 from TDAbboud/30096-add-host-docker-build
...
Add --add-host for docker build
Upstream-commit: a64ea37753fd9a94dfa3ab81f67f46df7bd641f8
Component: engine
2017-02-27 12:42:18 +01:00
Brian Goff
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
Harald Albers
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
yupengzte
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
Vincent Demeester
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
Yong Tang
5050030ffa
Add --stop-signal for service create and service update
...
This fix tries to address the issue raised in 25696 where
it was not possible to specify `--stop-signal` for `docker service create`
and `docker service update`, in order to use special signal to stop
the container.
This fix adds `--stop-signal` and update the `StopSignal` in `Config`
through `service create` and `service update`.
Related docs has been updated.
Integration test has been added.
This fix fixes 25696.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c2d49ec214649b0025f7060429334893350fbaee
Component: engine
2017-02-21 15:19:45 -08:00
Sebastiaan van Stijn
301cc805aa
Merge pull request #30814 from YuPengZTE/devSwarmCliExplain
...
fix the type
Upstream-commit: 25500d56a5f3a94456bd8172a64bf119cc36dd7f
Component: engine
2017-02-21 00:59:58 +01:00
Tony Abboud
7dba33b4e7
Add --add-host for docker build
...
Signed-off-by: Tony Abboud <tdabboud@hotmail.com >
Upstream-commit: 7a962e4577628c357f96153eca07e527813fb42b
Component: engine
2017-02-20 17:32:28 -05:00
Vincent Demeester
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
erxian
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
Sebastiaan van Stijn
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
Yong Tang
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
Anusha Ragunathan
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
Anusha Ragunathan
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
Anusha Ragunathan
f93c7187cd
Service creation using network plugin filters.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: bcdd6aa3561357bed88e2aeb07445225fc8c12a9
Component: engine
2017-02-17 09:41:37 -08:00
Brian Goff
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
Daniel Zhang
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
Zhang Wei
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
Misty Stanley-Jones
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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