e85d8b261b
Splunk Logging Driver: formats and verifyconnection
...
`--log-opt splunk-format=inline|json|raw` allows to change how logging
driver sends data to Splunk, where
`inline` - default value, format used before, message is injected as a
line in JSON payload
`json` - driver will try to parse each line as a JSON object and embed it
inside of the JSON payload
`raw` - driver will send Raw payload instead of JSON, tag and attributes
will be prefixed before the message
`--log-opt splunk-verify-connection=true|false` - allows to skip
verification for Splunk Url
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 603fd0831513257bc26d20ca1f64efcc4965eae6
Component: engine
2016-08-16 21:45:16 -07:00
a413b2d6cd
Merge pull request #25701 from WeiZhang555/update-conflict-rm-restart
...
Forbid update restart policy of container with AutoRemove flag
Upstream-commit: 9a3e7d9e343938218aac8217c4b8ba4c21b841c4
Component: engine
2016-08-16 10:37:45 -07:00
06f36cfa80
Merge pull request #25337 from jhorwit2/jah/25332
...
Add --no-trunc to service/node/stack ps output
Upstream-commit: 0c8b0faef8dfb2aa97575bae8afa152e54e63492
Component: engine
2016-08-16 09:25:45 -07:00
3e85f88396
Merge pull request #25757 from eskaaren/create_service_id
...
Capital D in "ID" returned when creating service
Upstream-commit: 641e1564cfeb3f94f68f3c43a353df10331afecf
Component: engine
2016-08-16 17:01:22 +02:00
b99343eade
Merge pull request #25758 from eskaaren/create_service_annotations
...
"Annotations" not a parameter
Upstream-commit: e48aeb118c088f63c0708f953d84cd9041920e0f
Component: engine
2016-08-16 16:51:15 +02:00
cff5a79975
Add --no-trunc to service/node/stack ps output
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 204c4d39d3241cff1b44f438b99bd0d6484e7b48
Component: engine
2016-08-16 10:19:11 -04:00
5d91ad733a
Merge pull request #25756 from YuPengZTE/shuold-be--
...
“ should be "
Upstream-commit: 79c1cd87ec74aa5ca71ceb52e12ab2f15efd8b24
Component: engine
2016-08-16 09:31:07 -04:00
eefe7f0f5d
"Annotations" not a parameter
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 69e481af4e1fec65629c6ea4eb74fc58f5abc932
Component: engine
2016-08-16 15:17:26 +02:00
4a7e8b4b54
Merge pull request #25720 from thaJeztah/add-missing-label-filter-docs
...
Add missing docs for volume ls filter=label
Upstream-commit: dcdf2b404ef1859500c169c0a2fdb1d78add3d58
Component: engine
2016-08-16 13:50:56 +02:00
cf3d39b364
Capital D in "ID" returned when creating service
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 9eb2ec799eb37210dee5183ace375e480bbfd8aa
Component: engine
2016-08-16 13:43:23 +02:00
c2797cb474
Merge pull request #25753 from eskaaren/swarm_inspect
...
Add doc for inspect swarm
Upstream-commit: 1f0a99e86f78f5c5f076c1dcd10ad329ea8ee737
Component: engine
2016-08-16 13:19:36 +02:00
20d4e38a31
Add doc for inspect swarm
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: c59bc537274aa7f4dc9702ea08c349c71a024b39
Component: engine
2016-08-16 12:49:33 +02:00
61ea39768c
“ should be "
...
Full width turn half-width character
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: fe081efa929bab70f72f47ec360cd91a65bd8d46
Component: engine
2016-08-16 18:41:34 +08:00
cd9750292a
Merge pull request #23808 from AkihiroSuda/formatinfo
...
add `--format` flag to `docker info`
Upstream-commit: 348f6529b71502b561aa493e250fd5be248da0d5
Component: engine
2016-08-16 12:04:26 +02:00
aab3a8354b
Merge pull request #25705 from AkihiroSuda/noteRenameCOW
...
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
Upstream-commit: 7524a1d3f2fa3489d689b1973dfb84e13615d3de
Component: engine
2016-08-16 10:52:25 +02:00
d1bde01a82
Forbid update restart policy of container with AutoRemove flag
...
"--restart" and "--rm" are conflict options, if a container is started
with AutoRemove flag, we should forbid the update action for its Restart
Policy.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4754c64ab5b5bf5ae6f8a3040606296910e6cb19
Component: engine
2016-08-16 15:36:13 +08:00
1b140377f0
add --format flag to docker info
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: dc38c9a04705f0a9ad3e007f7869cfb6a8a3a8b8
Component: engine
2016-08-16 04:03:52 +00:00
871f085a91
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
...
Close #25409
Update #10180
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aab101a770a88cdbde5012dc7eb5b4439cf57192
Component: engine
2016-08-16 02:13:33 +00:00
fe5ecb2397
Merge pull request #25706 from thaJeztah/add-authorization-header-to-api-docs
...
Add X-Registry-Auth header to service API docs
Upstream-commit: 9079d5ccbb040363a89c87d87eac693575848c80
Component: engine
2016-08-15 21:54:06 +02:00
fba4d062dd
Merge pull request #25707 from thaJeztah/move-sysctls-to-correct-api-version
...
Move sysctls to correct API version
Upstream-commit: 4105cff4d8d5bb55661944286ceee03f9c5c36ee
Component: engine
2016-08-15 20:29:51 +02:00
763cc81465
Add missing docs for volume ls filter=label
...
This filter option was added in be045ee2da7c2c83e859d86cb496e86ec6de8566,
but didn't update the documentation and
man pages.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5171b8349578a89efca69942f81f7e3c560840b9
Component: engine
2016-08-15 17:42:16 +02:00
d3c1040e86
Merge pull request #25710 from thaJeztah/restore-missing-ps-example
...
Restore missing ps example for killed containers
Upstream-commit: 0f838cc5230c12f073095bf537ec896e95d1f631
Component: engine
2016-08-15 16:02:16 +02:00
fc75fb9bbd
Merge pull request #25700 from lixiaobing10051267/masterSwarmRmService
...
command "docker service remove" not consistent
Upstream-commit: bfc3f121f10f0dd17833ee1f2d8ccd8b7dcafa5f
Component: engine
2016-08-15 09:55:52 -04:00
bb8ea42967
Fix capitalization
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 75e60fbe09f6065ed095671f98713d862c466858
Component: engine
2016-08-15 14:14:41 +02:00
0e20dbce72
Restore missing ps example for killed containers
...
This example was added in b0b2f979c7c43e2975d5e39340c168da2da42d1d,
but got lost during splitting up the cli.md docs into separate files;
561bfb268de3c674b04d48895b7e46ae890ef795
This restores the missing example.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8d5818a6931db9d0acd4a6663815cd317da1bb6b
Component: engine
2016-08-15 13:41:18 +02:00
6cf3b48c91
Move sysctls to correct API version
...
Commit 067b510dfc5b90a1d7712c89e857b6dafb184f24 move the
sysctls feature to the right API version, but
missed this one.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7cdd693d5d2094f73383145eb74d81c6b9bb9b24
Component: engine
2016-08-15 12:02:54 +02:00
83afa41419
Add X-Registry-Auth header to service API docs
...
The service create/update endpoints support
passing registry-authentication information,
but this was not documented.
This adds the missing information about passing
a X-Registry-Auth header.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bde35ef18a408a297b960c439dc029cfb5e15464
Component: engine
2016-08-15 11:53:12 +02:00
9716ade879
command "docker service remove" not insistant
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 078e2aa1571ad402f0a9599e6fac2286a3d35f54
Component: engine
2016-08-15 15:11:37 +08:00
64adc1d87d
Merge pull request #25673 from SvenDowideit/remove-dead-link
...
James' site has been dead for a while - removing links
Upstream-commit: 7fddf51aa4e71ca7b0a08df2a960d8b220703f0e
Component: engine
2016-08-13 09:35:04 +02:00
a863701de5
add overlay networking guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b
Component: engine
2016-08-12 15:18:21 -07:00
0fd4a2c993
James' site has been dead for a while - removing links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a9b08f3102e946df44337deb65c99b41570754d1
Component: engine
2016-08-12 21:16:57 +00:00
44701ad93a
add overlay networking security model node
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: cc5debcb2e8621358721eb860c07f33f8b83d684
Component: engine
2016-08-12 13:17:24 -07:00
51e7a5bb32
Merge pull request #25669 from dlech/patch-2
...
Move export from image commands to container commands
Upstream-commit: 838db8852cb58e4990c655f09d5b7c50cc5396a6
Component: engine
2016-08-12 15:52:07 -04:00
b6f32f3c93
Move export from image commands to container commands
...
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.
Signed-off-by: David Lechner <david@lechnology.com >
Upstream-commit: 43c8cc7bb4dd42bebabf68e509a3596ef7a642cd
Component: engine
2016-08-12 12:15:32 -05:00
f039ea6e5b
Update API docs example for image load response
...
Commit 353af0b3ecfe483568fd88754e432c92b0ec088b updated
the `/image/load` endpoint to consistendly return
JSON, but did not update the associated documentation.
This updates the example response in the documentation
to match the actual response.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 419d2ad0f8adc687bb25831d62f462353557a706
Component: engine
2016-08-12 11:57:34 +02:00
720eb363bf
Merge pull request #25564 from coolljt0725/fix_inspect_network
...
Fix inspect network show gateway with mask
Upstream-commit: d8240c8e27b625c6c2b7982e2473cce46e2a9ddc
Component: engine
2016-08-12 11:11:09 +02:00
42880e91b6
Remove --network-add and --network-rm flags from service update
...
These flags were not supported (daemon returns an error), and it was an
oversight. They were not present in completion scripts.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 3a7e90c743f6fdccb8aecb9d6d9afd42232fa736
Component: engine
2016-08-11 19:37:21 -07:00
8eacfa50f9
Fix inspect network show gateway with mask
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 096bb5fb0740656b91b3e35f8df23c79270f7f90
Component: engine
2016-08-11 21:08:54 -04:00
eda65f43e9
Merge pull request #25614 from mbentley/docs-update-ubuntu-install
...
Add install of virtual kernel extras for AUFS
Upstream-commit: 532aeff9d553f46d46ec7c164a4dd26af18b9fd6
Component: engine
2016-08-11 13:47:33 -07:00
80712ffaad
Merge pull request #25548 from thaJeztah/plugin-api-docs
...
Add API documentation for experimental plugin features
Upstream-commit: 5b68177a6e3865a3880d8b3a4e5b932d3ccae1dc
Component: engine
2016-08-11 21:52:04 +02:00
adf210319c
Merge pull request #25556 from vieux/plugin_description
...
add description in docker plugin ls
Upstream-commit: ed1a313d8f03ce1cc2eef56e66644fccb4d61eaa
Component: engine
2016-08-11 14:08:50 +02:00
3344338b88
Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api
...
add fields in volume api for 1.24, 1.25
Upstream-commit: a3432c2fdbc2bdab15e49599815f42660904fdd9
Component: engine
2016-08-11 14:03:25 +02:00
0eb3f4278c
add fields in volume api for 1.24, 1.25
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b015fd4fb3a8def4812491bae702275efc6ab0cb
Component: engine
2016-08-11 19:56:17 +08:00
7c0ad19006
Add install of virtual kernel extras for AUFS
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com >
Upstream-commit: e715ca506f41b22cde21187328fcb416cec5e6a2
Component: engine
2016-08-11 07:54:20 -04:00
78c72ac827
Merge pull request #25611 from lixiaobing10051267/masterJoin
...
docker swarm join command has no flag '--swarm-token'
Upstream-commit: f1101ebf3e8fed953528c30bb7d329857fb58805
Component: engine
2016-08-11 13:30:07 +02:00
ea7fd73f3c
docker swarm join command has no flag 'X--swarm-token'
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fcf732117df0d4a57202cc056ee9c24749745bd4
Component: engine
2016-08-11 19:49:38 +08:00
ed03b3e574
Merge pull request #25610 from lixiaobing10051267/masterSwarm
...
optimize some descriptions for swarm nodes.md
Upstream-commit: 81fca603a4c828a7bca882cd504cc32b0a7b0d1d
Component: engine
2016-08-11 13:29:47 +02:00
a0f2fd5022
optimize some descriptions for swarm nodes.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fa52bd5cf8f8e40189a0a9ba1bac61bd5ace4a91
Component: engine
2016-08-11 19:07:56 +08:00
ca39dfa474
Merge pull request #25573 from thaJeztah/improve-runmetrics-layout
...
docs: improve layout for runmetrics
Upstream-commit: a19029a719f209f1bf2e760f11225027787550e2
Component: engine
2016-08-11 10:43:15 +02:00
4074463266
Merge pull request #25585 from yongtang/22311-log-opts-map
...
Update docs so that log-opts takes map (`{}`) instead of `[]`
Upstream-commit: e42cc1f6c53a139e08c28dee607105eecafc029e
Component: engine
2016-08-11 09:55:25 +02:00
